From 2d2a6e9b32d087f70d8be9167a170ad47b5bea83 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 12:23:42 +0000 Subject: [PATCH 01/44] Fixed fruit tree growth + use bonemeal to grow apples --- .../unicopia/block/FruitBearingBlock.java | 133 +++++++++++++----- .../unicopia/block/FruitBlock.java | 12 ++ 2 files changed, 106 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java index 51c7b4a2..6cdcf741 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java @@ -24,9 +24,9 @@ import net.minecraft.util.math.random.Random; import net.minecraft.world.*; import net.minecraft.world.event.GameEvent; -public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Buckable { +public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Buckable, Fertilizable { public static final IntProperty AGE = Properties.AGE_25; - public static final int WITHER_AGE = 15; + public static final int MAX_AGE = 25; public static final EnumProperty STAGE = EnumProperty.of("stage", Stage.class); private final Supplier fruit; @@ -41,7 +41,7 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka .allowsSpawning(BlockConstructionUtils::canSpawnOnLeaves) .suffocates(BlockConstructionUtils::never) .blockVision(BlockConstructionUtils::never)); - setDefaultState(getDefaultState().with(STAGE, Stage.IDLE)); + setDefaultState(getDefaultState().with(AGE, 0).with(STAGE, Stage.IDLE)); this.overlay = overlay; this.fruit = fruit; this.rottenFruitSupplier = rottenFruitSupplier; @@ -76,51 +76,81 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka } if (world.getBaseLightLevel(pos, 0) > 8) { - BlockSoundGroup group = getSoundGroup(state); int steps = FertilizableUtil.getGrowthSteps(world, pos, state, random); while (steps-- > 0) { if (!shouldAdvance(random)) { continue; } - if (state.get(STAGE) == Stage.FRUITING) { - state = state.cycle(AGE); - if (state.get(AGE) > 20) { - state = state.with(AGE, 0).cycle(STAGE); - } - } else { - state = state.with(AGE, 0).cycle(STAGE); - } - world.setBlockState(pos, state, Block.NOTIFY_ALL); + state = cycleStage(state); BlockPos fruitPosition = pos.down(); - - Stage stage = state.get(STAGE); - - if (stage == Stage.FRUITING && isPositionValidForFruit(state, pos)) { - if (world.isAir(fruitPosition)) { - world.setBlockState(fruitPosition, getPlacedFruitState(random), Block.NOTIFY_ALL); - } - } - BlockState fruitState = world.getBlockState(fruitPosition); - if (stage == Stage.WITHERING && fruitState.isOf(fruit.get())) { - if (world.random.nextInt(2) == 0) { - Block.dropStack(world, fruitPosition, rottenFruitSupplier.get()); - } else { - Block.dropStacks(fruitState, world, fruitPosition, fruitState.hasBlockEntity() ? world.getBlockEntity(fruitPosition) : null, null, ItemStack.EMPTY); + switch (state.get(STAGE)) { + case WITHERING: + wither(state, world, pos, fruitPosition, world.getBlockState(fruitPosition)); + case BEARING: + if (!fruitState.isOf(fruit.get())) { + state = withStage(state, Stage.IDLE); + } + break; + case FRUITING: { + if (!isPositionValidForFruit(state, pos)) { + state = withStage(state, Stage.IDLE); + } else { + state = grow(state, world, pos, fruitPosition, fruitState, random); + } + break; } - - if (world.removeBlock(fruitPosition, false)) { - world.emitGameEvent(GameEvent.BLOCK_DESTROY, pos, GameEvent.Emitter.of(fruitState)); - } - - world.playSound(null, pos, USounds.ITEM_APPLE_ROT, SoundCategory.BLOCKS, group.getVolume(), group.getPitch()); + default: } + + world.setBlockState(pos, state, Block.NOTIFY_ALL); } } } + protected BlockState withStage(BlockState state, Stage stage) { + return state.with(AGE, 0).with(STAGE, stage); + } + + private BlockState cycleStage(BlockState state) { + state = state.cycle(AGE); + if (state.get(AGE) == 0) { + state = state.cycle(STAGE); + } + return state; + } + + protected BlockState grow(BlockState state, World world, BlockPos pos, BlockPos fruitPosition, BlockState fruitState, Random random) { + if (world.isAir(fruitPosition)) { + world.setBlockState(fruitPosition, getPlacedFruitState(random), Block.NOTIFY_ALL); + return withStage(state, Stage.BEARING); + } + + if (!fruitState.isOf(fruit.get())) { + return withStage(state, Stage.IDLE); + } + return state; + } + + protected void wither(BlockState state, World world, BlockPos pos, BlockPos fruitPosition, BlockState fruitState) { + if (!fruitState.isOf(fruit.get())) { + if (world.random.nextInt(2) == 0) { + Block.dropStack(world, fruitPosition, rottenFruitSupplier.get()); + } else { + Block.dropStacks(fruitState, world, fruitPosition, fruitState.hasBlockEntity() ? world.getBlockEntity(fruitPosition) : null, null, ItemStack.EMPTY); + } + + if (world.removeBlock(fruitPosition, false)) { + world.emitGameEvent(GameEvent.BLOCK_DESTROY, pos, GameEvent.Emitter.of(fruitState)); + } + + BlockSoundGroup group = getSoundGroup(state); + world.playSound(null, pos, USounds.ITEM_APPLE_ROT, SoundCategory.BLOCKS, group.getVolume(), group.getPitch()); + } + } + @Override public List onBucked(ServerWorld world, BlockState state, BlockPos pos) { world.setBlockState(pos, state.with(STAGE, Stage.IDLE).with(AGE, 0)); @@ -142,21 +172,46 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka return state.getRenderingSeed(pos) % 3 == 1; } + @Override + public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state, boolean isClient) { + return switch (state.get(STAGE)) { + case FLOWERING -> world.isAir(pos.down()); + default -> !world.getBlockState(pos.down()).isOf(fruit.get()); + }; + } + + @Override + public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) { + return isFertilizable(world, pos, state, false); + } + + @Override + public void grow(ServerWorld world, Random random, BlockPos pos, BlockState state) { + state = state.cycle(AGE); + if (state.get(AGE) == 0) { + state = state.with(STAGE, switch (state.get(STAGE)) { + case IDLE -> Stage.FLOWERING; + case FLOWERING -> Stage.FRUITING; + default -> Stage.FLOWERING; + }); + } + if (state.get(STAGE) == Stage.FRUITING && state.get(AGE) == 0) { + state = grow(state, world, pos, pos.down(), world.getBlockState(pos.down()), random); + } + world.setBlockState(pos, state); + } + public enum Stage implements StringIdentifiable { IDLE, FLOWERING, FRUITING, + BEARING, WITHERING; - private static final Stage[] VALUES = values(); - - public Stage getNext() { - return VALUES[(ordinal() + 1) % VALUES.length]; - } - @Override public String asString() { return name().toLowerCase(Locale.ROOT); } } + } diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java index 8313bcf7..d3bea9c6 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/FruitBlock.java @@ -74,6 +74,18 @@ public class FruitBlock extends Block implements Buckable { } } + @Deprecated + @Override + public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { + super.onStateReplaced(state, world, pos, newState, moved); + if (!newState.isOf(state.getBlock())) { + BlockState leaves = world.getBlockState(pos.up()); + if (leaves.contains(FruitBearingBlock.STAGE)) { + world.setBlockState(pos.up(), leaves.withIfExists(FruitBearingBlock.AGE, 0).with(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.IDLE)); + } + } + } + protected boolean canAttachTo(BlockState state) { return state.isOf(stem); } From 3165f3cd2a67f03dfdd9ca6c0f9c6a94e95ece2b Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 12:45:53 +0000 Subject: [PATCH 02/44] Fix some rendering issues with filled jars --- .../com/minelittlepony/unicopia/client/URenderers.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java index 798d7668..69d0ab9c 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/URenderers.java +++ b/src/main/java/com/minelittlepony/unicopia/client/URenderers.java @@ -52,6 +52,7 @@ import net.minecraft.client.item.ModelPredicateProviderRegistry; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.*; +import net.minecraft.client.render.VertexConsumerProvider.Immediate; import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; import net.minecraft.client.render.entity.FlyingItemEntityRenderer; import net.minecraft.client.render.item.ItemRenderer; @@ -210,7 +211,6 @@ public interface URenderers { matrices.translate(0, 0.06, 0); } // GUI, FIXED, NONE - translate(0, 0, 0) - //matrices.scale(0.5F, 0.5F, 0.5F); float scale = 0.5F; matrices.scale(scale, scale, scale); @@ -219,11 +219,16 @@ public interface URenderers { renderer.renderItem(appearance, mode, light, overlay, matrices, immediate, world, 0); matrices.pop(); } - renderer.renderItem(item.createAppearanceStack(stack, UItems.EMPTY_JAR), mode, light, OverlayTexture.DEFAULT_UV, matrices, vertices, world, 0); + renderer.renderItem(UItems.EMPTY_JAR.getDefaultStack(), mode, light, overlay, matrices, vertices, world, 0); if (mode == ModelTransformationMode.GUI) { + if (vertices instanceof Immediate i) { + i.draw(); + } + DiffuseLighting.enableGuiDepthLighting(); } + matrices.push(); } From 308cb721cd077210736314b3ad362cfdb36c5477 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 14:07:36 +0000 Subject: [PATCH 03/44] Separate the magic beam into its own entity --- .../ability/magic/spell/ThrowableSpell.java | 32 +--- .../magic/spell/effect/CatapultSpell.java | 9 +- .../magic/spell/effect/DarkVortexSpell.java | 5 +- .../magic/spell/effect/DispellEvilSpell.java | 5 +- .../magic/spell/effect/FireBoltSpell.java | 6 +- .../magic/spell/effect/NecromancySpell.java | 8 +- .../entity/MagicBeamEntityRenderer.java | 15 +- .../unicopia/entity/mob/UEntities.java | 3 +- .../unicopia/network/Channel.java | 1 - .../handler/ClientNetworkHandlerImpl.java | 30 --- .../unicopia/projectile/MagicBeamEntity.java | 171 ++++++++++++++++++ .../projectile/MagicProjectileEntity.java | 138 ++------------ 12 files changed, 220 insertions(+), 203 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java index ddb3a43f..3e60cba0 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/ThrowableSpell.java @@ -7,11 +7,7 @@ import java.util.Optional; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.effect.CustomisedSpellType; -import com.minelittlepony.unicopia.entity.mob.UEntities; -import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; - -import net.minecraft.entity.Entity; +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.world.World; @@ -43,7 +39,7 @@ public final class ThrowableSpell extends AbstractDelegatingSpell { * * Returns the resulting projectile entity for customization (or null if on the client). */ - public Optional throwProjectile(Caster caster) { + public Optional throwProjectile(Caster caster) { return throwProjectile(caster, 1); } @@ -52,33 +48,23 @@ public final class ThrowableSpell extends AbstractDelegatingSpell { * * Returns the resulting projectile entity for customization (or null if on the client). */ - public Optional throwProjectile(Caster caster, float divergance) { + public Optional throwProjectile(Caster caster, float divergance) { World world = caster.asWorld(); - Entity entity = caster.asEntity(); - caster.playSound(USounds.SPELL_CAST_SHOOT, 0.7F, 0.4F / (world.random.nextFloat() * 0.4F + 0.8F)); if (caster.isClient()) { return Optional.empty(); } - Spell s = spell.get().prepareForCast(caster, CastingMethod.STORED); - if (s == null) { - return Optional.empty(); - } + return Optional.ofNullable(spell.get().prepareForCast(caster, CastingMethod.STORED)).map(s -> { + MagicBeamEntity projectile = new MagicBeamEntity(world, caster.asEntity(), divergance, s); - MagicProjectileEntity projectile = UEntities.MAGIC_BEAM.create(world); - projectile.setPosition(entity.getX(), entity.getEyeY() - 0.1F, entity.getZ()); - projectile.setOwner(entity); - projectile.setItem(UItems.GEMSTONE.getDefaultStack(spell.get().getType())); - s.apply(projectile); - projectile.setVelocity(entity, entity.getPitch(), entity.getYaw(), 0, 1.5F, divergance); - projectile.setNoGravity(true); - configureProjectile(projectile, caster); - world.spawnEntity(projectile); + configureProjectile(projectile, caster); + world.spawnEntity(projectile); - return Optional.of(projectile); + return projectile; + }); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java index c72a69d1..ec5cbf3e 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/CatapultSpell.java @@ -10,6 +10,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.Situation; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; import com.minelittlepony.unicopia.mixin.MixinFallingBlockEntity; +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; @@ -42,15 +43,15 @@ public class CatapultSpell extends AbstractSpell implements ProjectileDelegate.B @Override public void onImpact(MagicProjectileEntity projectile, BlockHitResult hit) { - if (!projectile.isClient() && projectile.canModifyAt(hit.getBlockPos())) { - createBlockEntity(projectile.getWorld(), hit.getBlockPos(), e -> apply(projectile, e)); + if (!projectile.isClient() && projectile instanceof MagicBeamEntity source && source.canModifyAt(hit.getBlockPos())) { + createBlockEntity(projectile.getWorld(), hit.getBlockPos(), e -> apply(source, e)); } } @Override public void onImpact(MagicProjectileEntity projectile, EntityHitResult hit) { - if (!projectile.isClient()) { - apply(projectile, hit.getEntity()); + if (!projectile.isClient() && projectile instanceof MagicBeamEntity source) { + apply(source, hit.getEntity()); } } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java index d21a9c3e..ea5f8462 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java @@ -16,6 +16,7 @@ import com.minelittlepony.unicopia.particle.FollowingParticleEffect; import com.minelittlepony.unicopia.particle.LightningBoltParticleEffect; import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; import com.minelittlepony.unicopia.util.shape.Sphere; @@ -55,10 +56,10 @@ public class DarkVortexSpell extends AttractiveSpell implements ProjectileDelega @Override public void onImpact(MagicProjectileEntity projectile, BlockHitResult hit) { - if (!projectile.isClient()) { + if (!projectile.isClient() && projectile instanceof MagicBeamEntity source) { BlockPos pos = hit.getBlockPos(); projectile.getWorld().createExplosion(projectile, pos.getX(), pos.getY(), pos.getZ(), 3, ExplosionSourceType.NONE); - toPlaceable().tick(projectile, Situation.BODY); + toPlaceable().tick(source, Situation.BODY); } } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DispellEvilSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DispellEvilSpell.java index 4a488942..869ef51d 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DispellEvilSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DispellEvilSpell.java @@ -5,6 +5,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.*; import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits; import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; import com.minelittlepony.unicopia.particle.LightningBoltParticleEffect; +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; @@ -48,6 +49,8 @@ public class DispellEvilSpell extends AbstractSpell implements ProjectileDelegat @Override public void onImpact(MagicProjectileEntity projectile) { - tick(projectile, Situation.GROUND); + if (projectile instanceof MagicBeamEntity source) { + tick(source, Situation.GROUND); + } } } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java index a76ef43b..db63eaf4 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/FireBoltSpell.java @@ -45,13 +45,11 @@ public class FireBoltSpell extends AbstractSpell implements HomingSpell, @Override public boolean tick(Caster caster, Situation situation) { if (situation == Situation.PROJECTILE) { - if (caster instanceof MagicProjectileEntity && getTraits().get(Trait.FOCUS) >= 50) { + if (caster instanceof MagicProjectileEntity projectile && getTraits().get(Trait.FOCUS) >= 50) { caster.findAllEntitiesInRange( getTraits().get(Trait.FOCUS) - 49, EntityPredicates.VALID_LIVING_ENTITY.and(TargetSelecter.validTarget(this, caster)) - ).findFirst().ifPresent(target -> { - ((MagicProjectileEntity)caster).setHomingTarget(target); - }); + ).findFirst().ifPresent(target -> projectile.setHomingTarget(target)); } return true; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/NecromancySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/NecromancySpell.java index 56e16c10..1e4243a6 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/NecromancySpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/NecromancySpell.java @@ -12,6 +12,7 @@ import com.minelittlepony.unicopia.ability.magic.spell.trait.Trait; import com.minelittlepony.unicopia.entity.Creature; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.entity.Equine; +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; import com.minelittlepony.unicopia.util.Weighted; @@ -231,9 +232,10 @@ public class NecromancySpell extends AbstractAreaEffectSpell implements Projecti } @Override - public void onImpact(MagicProjectileEntity source, BlockHitResult hit) { - - // source.asWorld().createExplosion(source, hit.getPos().x, hit.getPos().y, hit.getPos().z, 3, ExplosionSourceType.MOB); + public void onImpact(MagicProjectileEntity projectile, BlockHitResult hit) { + if (!(projectile instanceof MagicBeamEntity source)) { + return; + } Shape affectRegion = new Sphere(false, 3); diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/MagicBeamEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/MagicBeamEntityRenderer.java index baf37053..26e2297a 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/entity/MagicBeamEntityRenderer.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/MagicBeamEntityRenderer.java @@ -1,8 +1,7 @@ package com.minelittlepony.unicopia.client.render.entity; import com.minelittlepony.unicopia.client.render.RenderLayers; -import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; - +import com.minelittlepony.unicopia.projectile.MagicBeamEntity; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.ModelData; import net.minecraft.client.model.ModelPart; @@ -23,7 +22,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -public class MagicBeamEntityRenderer extends EntityRenderer { +public class MagicBeamEntityRenderer extends EntityRenderer { private final Model model; public MagicBeamEntityRenderer(EntityRendererFactory.Context ctx) { @@ -32,17 +31,17 @@ public class MagicBeamEntityRenderer extends EntityRenderer { + public class Model extends EntityModel { private final ModelPart part; @@ -89,7 +88,7 @@ public class MagicBeamEntityRenderer extends EntityRenderer MAGIC_BEAM = register("magic_beam", FabricEntityTypeBuilder.create(SpawnGroup.MISC, MagicProjectileEntity::new) + EntityType MAGIC_BEAM = register("magic_beam", FabricEntityTypeBuilder.create(SpawnGroup.MISC, MagicBeamEntity::new) .trackRangeBlocks(100) .trackedUpdateRate(2) .dimensions(EntityDimensions.fixed(0.25F, 0.25F))); diff --git a/src/main/java/com/minelittlepony/unicopia/network/Channel.java b/src/main/java/com/minelittlepony/unicopia/network/Channel.java index d1a6bc19..3f65e69c 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/Channel.java +++ b/src/main/java/com/minelittlepony/unicopia/network/Channel.java @@ -19,7 +19,6 @@ public interface Channel { C2SPacketType FLIGHT_CONTROLS_INPUT = SimpleNetworking.clientToServer(Unicopia.id("flight_controls"), MsgPlayerFlightControlsInput::new); S2CPacketType SERVER_PLAYER_CAPABILITIES = SimpleNetworking.serverToClient(Unicopia.id("player_capabilities"), MsgPlayerCapabilities::new); - S2CPacketType SERVER_SPAWN_PROJECTILE = SimpleNetworking.serverToClient(Unicopia.id("projectile_entity"), MsgSpawnProjectile::new); S2CPacketType SERVER_BLOCK_DESTRUCTION = SimpleNetworking.serverToClient(Unicopia.id("block_destruction"), MsgBlockDestruction::new); S2CPacketType CANCEL_PLAYER_ABILITY = SimpleNetworking.serverToClient(Unicopia.id("player_ability_cancel"), MsgCancelPlayerAbility::read); S2CPacketType SERVER_REQUEST_PLAYER_LOOK = SimpleNetworking.serverToClient(Unicopia.id("request_player_look"), MsgCasterLookRequest::new); diff --git a/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java b/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java index d9b9e07f..e4c97d2e 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java +++ b/src/main/java/com/minelittlepony/unicopia/network/handler/ClientNetworkHandlerImpl.java @@ -2,8 +2,6 @@ package com.minelittlepony.unicopia.network.handler; import java.util.Map; -import com.minelittlepony.unicopia.InteractionManager; -import com.minelittlepony.unicopia.Owned; import com.minelittlepony.unicopia.USounds; import com.minelittlepony.unicopia.ability.data.Rot; import com.minelittlepony.unicopia.ability.data.tree.TreeTypes; @@ -16,14 +14,11 @@ import com.minelittlepony.unicopia.client.gui.TribeSelectionScreen; import com.minelittlepony.unicopia.client.gui.spellbook.ClientChapters; import com.minelittlepony.unicopia.client.gui.spellbook.SpellbookChapterList.Chapter; import com.minelittlepony.unicopia.diet.PonyDiets; -import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.network.*; import com.minelittlepony.unicopia.network.MsgCasterLookRequest.Reply; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Identifier; @@ -32,7 +27,6 @@ public class ClientNetworkHandlerImpl { public ClientNetworkHandlerImpl() { Channel.SERVER_SELECT_TRIBE.receiver().addPersistentListener(this::handleTribeScreen); - Channel.SERVER_SPAWN_PROJECTILE.receiver().addPersistentListener(this::handleSpawnProjectile); Channel.SERVER_BLOCK_DESTRUCTION.receiver().addPersistentListener(this::handleBlockDestruction); Channel.CANCEL_PLAYER_ABILITY.receiver().addPersistentListener(this::handleCancelAbility); Channel.UNLOCK_TRAITS.receiver().addPersistentListener(this::handleUnlockTraits); @@ -47,30 +41,6 @@ public class ClientNetworkHandlerImpl { client.setScreen(new TribeSelectionScreen(packet.availableRaces(), packet.serverMessage())); } - @SuppressWarnings("unchecked") - private void handleSpawnProjectile(PlayerEntity sender, MsgSpawnProjectile packet) { - ClientWorld world = client.world; - Entity entity = packet.getEntityType().create(world); - - entity.updateTrackedPosition(packet.getX(), packet.getY(), packet.getZ()); - entity.refreshPositionAfterTeleport(packet.getX(), packet.getY(), packet.getZ()); - entity.setVelocity(packet.getVelocityX(), packet.getVelocityY(), packet.getVelocityZ()); - entity.setPitch(packet.getPitch() * 360 / 256F); - entity.setYaw(packet.getYaw() * 360 / 256F); - entity.setId(packet.getId()); - entity.setUuid(packet.getUuid()); - - if (entity instanceof Owned.Mutable) { - ((Owned.Mutable) entity).setMaster(world.getEntityById(packet.getEntityData())); - } - - if (entity.getType() == UEntities.MAGIC_BEAM) { - InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_MAGIC_BEAM, entity.getId()); - } - - world.addEntity(packet.getId(), entity); - } - private void handleBlockDestruction(PlayerEntity sender, MsgBlockDestruction packet) { ClientBlockDestructionManager destr = ((ClientBlockDestructionManager.Source)client.worldRenderer).getDestructionManager(); diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java new file mode 100644 index 00000000..2de94b7f --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicBeamEntity.java @@ -0,0 +1,171 @@ +package com.minelittlepony.unicopia.projectile; + +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; + +import com.minelittlepony.unicopia.Affinity; +import com.minelittlepony.unicopia.InteractionManager; +import com.minelittlepony.unicopia.ability.magic.Affine; +import com.minelittlepony.unicopia.ability.magic.Caster; +import com.minelittlepony.unicopia.ability.magic.Levelled; +import com.minelittlepony.unicopia.ability.magic.SpellContainer; +import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation; +import com.minelittlepony.unicopia.ability.magic.spell.Situation; +import com.minelittlepony.unicopia.ability.magic.spell.Spell; +import com.minelittlepony.unicopia.block.state.StatePredicate; +import com.minelittlepony.unicopia.entity.EntityPhysics; +import com.minelittlepony.unicopia.entity.MagicImmune; +import com.minelittlepony.unicopia.entity.Physics; +import com.minelittlepony.unicopia.entity.mob.UEntities; +import com.minelittlepony.unicopia.network.datasync.EffectSync; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.data.DataTracker; +import net.minecraft.entity.data.TrackedData; +import net.minecraft.entity.data.TrackedDataHandlerRegistry; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +public class MagicBeamEntity extends MagicProjectileEntity implements Caster, MagicImmune { + private static final TrackedData GRAVITY = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.FLOAT); + private static final TrackedData HYDROPHOBIC = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.BOOLEAN); + private static final TrackedData EFFECT = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.NBT_COMPOUND); + + private final EffectSync effectDelegate = new EffectSync(this, EFFECT); + + private final EntityPhysics physics = new EntityPhysics<>(this, GRAVITY); + + public MagicBeamEntity(EntityType type, World world) { + super(type, world); + } + + public MagicBeamEntity(World world, Entity owner, float divergance, Spell spell) { + super(UEntities.MAGIC_BEAM, world); + setPosition(owner.getX(), owner.getEyeY() - 0.1F, owner.getZ()); + setOwner(owner); + setVelocity(owner, owner.getPitch(), owner.getYaw(), 0, 1.5F, divergance); + setNoGravity(true); + spell.apply(this); + } + + @Override + protected void initDataTracker() { + super.initDataTracker(); + getDataTracker().startTracking(GRAVITY, 1F); + getDataTracker().startTracking(HYDROPHOBIC, false); + getDataTracker().startTracking(EFFECT, new NbtCompound()); + } + @Override + public void tick() { + super.tick(); + + if (getOwner() != null) { + effectDelegate.tick(Situation.PROJECTILE); + } + + + if (getHydrophobic()) { + if (StatePredicate.isFluid(getWorld().getBlockState(getBlockPos()))) { + Vec3d vel = getVelocity(); + + double velY = vel.y; + + velY *= -1; + + if (!hasNoGravity()) { + velY += 0.16; + } + + setVelocity(new Vec3d(vel.x, velY, vel.z)); + } + } + } + + public void setHydrophobic() { + getDataTracker().set(HYDROPHOBIC, true); + } + + public boolean getHydrophobic() { + return getDataTracker().get(HYDROPHOBIC); + } + + @Override + public MagicBeamEntity asEntity() { + return this; + } + + @Override + public LevelStore getLevel() { + return getMasterReference().getTarget().map(target -> target.level()).orElse(Levelled.EMPTY); + } + + @Override + public LevelStore getCorruption() { + return getMasterReference().getTarget().map(target -> target.corruption()).orElse(Levelled.EMPTY); + } + + @Override + public Physics getPhysics() { + return physics; + } + + @Override + public Affinity getAffinity() { + return getSpellSlot().get(true).map(Affine::getAffinity).orElse(Affinity.NEUTRAL); + } + + @Override + public SpellContainer getSpellSlot() { + return effectDelegate; + } + + @Override + public boolean subtractEnergyCost(double amount) { + return Caster.of(getMaster()).filter(c -> c.subtractEnergyCost(amount)).isPresent(); + } + + @Override + public void onSpawnPacket(EntitySpawnS2CPacket packet) { + super.onSpawnPacket(packet); + InteractionManager.instance().playLoopingSound(this, InteractionManager.SOUND_MAGIC_BEAM, getId()); + } + + @Override + public void remove(RemovalReason reason) { + super.remove(reason); + getSpellSlot().clear(); + } + + @Override + protected void forEachDelegates(Consumer consumer, Function predicate) { + effectDelegate.tick(spell -> { + Optional.ofNullable(predicate.apply(spell)).ifPresent(consumer); + return Operation.SKIP; + }); + super.forEachDelegates(consumer, predicate); + } + + @Override + public void readCustomDataFromNbt(NbtCompound compound) { + super.readCustomDataFromNbt(compound); + getDataTracker().set(HYDROPHOBIC, compound.getBoolean("hydrophobic")); + physics.fromNBT(compound); + if (compound.contains("effect")) { + getSpellSlot().put(Spell.readNbt(compound.getCompound("effect"))); + } + } + + @Override + public void writeCustomDataToNbt(NbtCompound compound) { + super.writeCustomDataToNbt(compound); + compound.putBoolean("hydrophobic", getHydrophobic()); + physics.toNBT(compound); + getSpellSlot().get(true).ifPresent(effect -> { + compound.put("effect", Spell.writeNbt(effect)); + }); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java index 6ca4cb3c..23c7f67d 100644 --- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java @@ -6,28 +6,12 @@ import java.util.function.Function; import org.jetbrains.annotations.Nullable; -import com.minelittlepony.unicopia.Affinity; import com.minelittlepony.unicopia.EquinePredicates; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.WeaklyOwned; -import com.minelittlepony.unicopia.ability.magic.Affine; -import com.minelittlepony.unicopia.ability.magic.Caster; -import com.minelittlepony.unicopia.ability.magic.Levelled; -import com.minelittlepony.unicopia.ability.magic.SpellContainer; -import com.minelittlepony.unicopia.ability.magic.SpellContainer.Operation; -import com.minelittlepony.unicopia.ability.magic.spell.Situation; -import com.minelittlepony.unicopia.ability.magic.spell.Spell; -import com.minelittlepony.unicopia.block.state.StatePredicate; -import com.minelittlepony.unicopia.entity.EntityPhysics; import com.minelittlepony.unicopia.entity.EntityReference; -import com.minelittlepony.unicopia.entity.MagicImmune; -import com.minelittlepony.unicopia.entity.Physics; import com.minelittlepony.unicopia.entity.mob.UEntities; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.network.Channel; -import com.minelittlepony.unicopia.network.MsgSpawnProjectile; -import com.minelittlepony.unicopia.network.datasync.EffectSync; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; @@ -40,8 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.particle.ItemStackParticleEffect; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; @@ -49,32 +31,22 @@ import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; /** * A generalised version of Mojang's projectile entity class with added support for a custom appearance and water phobia. - * - * Can also carry a spell if needed. */ -public class MagicProjectileEntity extends ThrownItemEntity implements Caster, WeaklyOwned.Mutable, MagicImmune { +public class MagicProjectileEntity extends ThrownItemEntity implements WeaklyOwned.Mutable { private static final TrackedData DAMAGE = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.FLOAT); - private static final TrackedData GRAVITY = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.FLOAT); - private static final TrackedData HYDROPHOBIC = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.BOOLEAN); - private static final TrackedData EFFECT = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.NBT_COMPOUND); public static final byte PROJECTILE_COLLISSION = 3; - private final EffectSync effectDelegate = new EffectSync(this, EFFECT); - - private final EntityPhysics physics = new EntityPhysics<>(this, GRAVITY); - private final EntityReference homingTarget = new EntityReference<>(); private EntityReference owner; private int maxAge = 90; - public MagicProjectileEntity(EntityType type, World world) { + public MagicProjectileEntity(EntityType type, World world) { super(type, world); } @@ -86,27 +58,24 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster type, World world, LivingEntity thrower) { + super(type, thrower, world); + } + @Override protected void initDataTracker() { super.initDataTracker(); - getDataTracker().startTracking(GRAVITY, 1F); getDataTracker().startTracking(DAMAGE, 0F); - getDataTracker().startTracking(EFFECT, new NbtCompound()); - getDataTracker().startTracking(HYDROPHOBIC, false); + } + + @Override + public World asWorld() { + return getWorld(); } @Override protected Item getDefaultItem() { - switch (getSpellSlot().get(false).map(Spell::getAffinity).orElse(Affinity.NEUTRAL)) { - case GOOD: return Items.SNOWBALL; - case BAD: return Items.MAGMA_CREAM; - default: return Items.AIR; - } - } - - @Override - public MagicProjectileEntity asEntity() { - return this; + return Items.AIR; } @Override @@ -140,36 +109,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster target.level()).orElse(Levelled.EMPTY); - } - - @Override - public LevelStore getCorruption() { - return getMasterReference().getTarget().map(target -> target.corruption()).orElse(Levelled.EMPTY); - } - - @Override - public Physics getPhysics() { - return physics; - } - - @Override - public Affinity getAffinity() { - return getSpellSlot().get(true).map(Affine::getAffinity).orElse(Affinity.NEUTRAL); - } - - @Override - public SpellContainer getSpellSlot() { - return effectDelegate; - } - - @Override - public boolean subtractEnergyCost(double amount) { - return Caster.of(getMaster()).filter(c -> c.subtractEnergyCost(amount)).isPresent(); - } - public void addThrowDamage(float damage) { setThrowDamage(getThrowDamage() + damage); } @@ -182,14 +121,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster { setNoGravity(true); noClip = true; @@ -261,12 +170,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster { - compound.put("effect", Spell.writeNbt(effect)); - }); } @Override @@ -296,12 +197,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster void forEachDelegates(Consumer consumer, Function predicate) { - effectDelegate.tick(spell -> { - Optional.ofNullable(predicate.apply(spell)).ifPresent(consumer); - return Operation.SKIP; - }); try { Optional.ofNullable(predicate.apply(getItem().getItem())).ifPresent(consumer); } catch (Throwable t) { Unicopia.LOGGER.error("Error whilst ticking spell on entity {}", getMasterReference(), t); } } - - @Override - public Packet createSpawnPacket() { - return Channel.SERVER_SPAWN_PROJECTILE.toPacket(new MsgSpawnProjectile(this)); - } } From 5348e12aca9526557d4ce6d32218a37958976135 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 14:15:20 +0000 Subject: [PATCH 04/44] Fix #290 and exclude spectators from being affected by magic --- .../java/com/minelittlepony/unicopia/EquinePredicates.java | 6 ++++-- .../unicopia/ability/magic/spell/effect/TargetSelecter.java | 2 -- .../unicopia/projectile/MagicProjectileEntity.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/EquinePredicates.java b/src/main/java/com/minelittlepony/unicopia/EquinePredicates.java index de83f274..6286b123 100644 --- a/src/main/java/com/minelittlepony/unicopia/EquinePredicates.java +++ b/src/main/java/com/minelittlepony/unicopia/EquinePredicates.java @@ -35,11 +35,13 @@ public interface EquinePredicates { Predicate IS_CASTER = e -> !e.isRemoved() && (e instanceof Caster || IS_PLAYER.test(e)); Predicate IS_PLACED_SPELL = e -> e instanceof Caster && !e.isRemoved(); - Predicate IS_MAGIC_IMMUNE = e -> (e instanceof MagicImmune || !(e instanceof LivingEntity)) + Predicate IS_MAGIC_IMMUNE = EntityPredicates.VALID_ENTITY.negate() + .or(EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.negate() + .or(e -> (e instanceof MagicImmune || !(e instanceof LivingEntity)) && !(e instanceof ItemEntity) && !(e instanceof ExperienceOrbEntity) && !(e instanceof BoatEntity) - && !(e instanceof ProjectileEntity); + && !(e instanceof ProjectileEntity))); Predicate EXCEPT_MAGIC_IMMUNE = IS_MAGIC_IMMUNE.negate(); Predicate VALID_LIVING_AND_NOT_MAGIC_IMMUNE = EntityPredicates.VALID_LIVING_ENTITY.and(EXCEPT_MAGIC_IMMUNE); diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TargetSelecter.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TargetSelecter.java index a6a3724c..c00d360b 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TargetSelecter.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/TargetSelecter.java @@ -12,7 +12,6 @@ import com.minelittlepony.unicopia.ability.magic.Affine; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.Spell; import net.minecraft.entity.Entity; -import net.minecraft.predicate.entity.EntityPredicates; public class TargetSelecter { private final Map targets = new TreeMap<>(); @@ -46,7 +45,6 @@ public class TargetSelecter { public Stream getEntities(Caster source, double radius) { targets.values().removeIf(Target::tick); return source.findAllEntitiesInRange(radius) - .filter(EntityPredicates.VALID_ENTITY) .filter(EquinePredicates.EXCEPT_MAGIC_IMMUNE) .filter(entity -> entity != source.asEntity() && checkAlliegance(spell, source, entity) && filter.test(source, entity)) .map(i -> { diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java index 23c7f67d..3b8064ae 100644 --- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java @@ -27,7 +27,6 @@ import net.minecraft.nbt.NbtElement; import net.minecraft.particle.ItemStackParticleEffect; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleTypes; -import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; @@ -208,7 +207,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements WeaklyOwn protected void onEntityHit(EntityHitResult hit) { Entity entity = hit.getEntity(); - if (EquinePredicates.IS_MAGIC_IMMUNE.test(entity) || !EntityPredicates.EXCEPT_CREATIVE_OR_SPECTATOR.test(entity)) { + if (EquinePredicates.IS_MAGIC_IMMUNE.test(entity)) { return; } From 385c412a9d0e8f22bc65b953d14bbe704bbe2b2e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 14:15:45 +0000 Subject: [PATCH 05/44] Don't harm entities the pegasus is carrying when doing a rainboom --- .../unicopia/ability/magic/spell/RainboomAbilitySpell.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java index 1c76b216..a3339212 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/RainboomAbilitySpell.java @@ -9,7 +9,6 @@ import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.ability.magic.spell.effect.*; import com.minelittlepony.unicopia.entity.damage.UDamageTypes; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.item.FriendshipBraceletItem; import com.minelittlepony.unicopia.particle.OrientedBillboardParticleEffect; import com.minelittlepony.unicopia.particle.ParticleSpawner; import com.minelittlepony.unicopia.particle.TargetBoundParticleEffect; @@ -60,9 +59,7 @@ public class RainboomAbilitySpell extends AbstractSpell { } } - source.findAllEntitiesInRange(RADIUS) - .filter(e -> !FriendshipBraceletItem.isComrade(source, e)) - .forEach(e -> { + source.findAllEntitiesInRange(RADIUS, e -> !source.isOwnerOrFriend(e)).forEach(e -> { e.damage(source.damageOf(UDamageTypes.RAINBOOM, source), 6); }); EFFECT_RANGE.translate(source.getOrigin()).getBlockPositions().forEach(pos -> { From 7d488217701510d844a1817621cd842135594c2f Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 3 Mar 2024 16:05:31 +0000 Subject: [PATCH 06/44] Adjust food balancing and create separate categories for fruit and baked goods, fix desserts and candy showing as fruits and vegetables in tooltips fix farmers delight dessert items not being part of the dessert category #293 --- .../minelittlepony/unicopia/diet/Effect.java | 2 +- .../unicopia/diet/PonyDiets.java | 9 +++++++ .../resources/assets/unicopia/lang/en_us.json | 3 +++ .../resources/data/c/tags/items/fruits.json | 5 ++-- .../diets/food_effects/baked_goods.json | 11 ++++++++ .../unicopia/diets/food_effects/candy.json | 11 ++++++++ .../unicopia/diets/food_effects/desserts.json | 11 ++++++++ .../unicopia/diets/food_effects/fruit.json | 11 ++++++++ .../data/unicopia/diets/races/alicorn.json | 11 ++++++-- .../data/unicopia/diets/races/bat.json | 2 +- .../data/unicopia/diets/races/changeling.json | 7 +++++ .../data/unicopia/diets/races/earth.json | 9 ++++++- .../data/unicopia/diets/races/hippogriff.json | 9 ++++++- .../data/unicopia/diets/races/kirin.json | 9 ++++++- .../data/unicopia/diets/races/pegasus.json | 9 ++++++- .../data/unicopia/diets/races/seapony.json | 2 +- .../data/unicopia/diets/races/unicorn.json | 9 ++++++- .../tags/items/food_types/baked_goods.json | 27 +++++++++++++++++++ .../tags/items/food_types/desserts.json | 8 ++++-- .../unicopia/tags/items/food_types/fruit.json | 18 +++++++++++++ 20 files changed, 169 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/data/unicopia/diets/food_effects/baked_goods.json create mode 100644 src/main/resources/data/unicopia/diets/food_effects/candy.json create mode 100644 src/main/resources/data/unicopia/diets/food_effects/desserts.json create mode 100644 src/main/resources/data/unicopia/diets/food_effects/fruit.json create mode 100644 src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json create mode 100644 src/main/resources/data/unicopia/tags/items/food_types/fruit.json diff --git a/src/main/java/com/minelittlepony/unicopia/diet/Effect.java b/src/main/java/com/minelittlepony/unicopia/diet/Effect.java index 4d0f1bb4..9b7ba05d 100644 --- a/src/main/java/com/minelittlepony/unicopia/diet/Effect.java +++ b/src/main/java/com/minelittlepony/unicopia/diet/Effect.java @@ -49,7 +49,7 @@ public record Effect( }); if (tooltip.size() == size) { if (stack.isFood()) { - tooltip.add(Text.literal(" ").append(Text.translatable("tag.unicopia.food_types.fruits_and_vegetables")).formatted(Formatting.GRAY)); + tooltip.add(Text.literal(" ").append(Text.translatable("tag.unicopia.food_types.misc")).formatted(Formatting.GRAY)); } else if (stack.getUseAction() == UseAction.DRINK) { tooltip.add(Text.literal(" ").append(Text.translatable("tag.unicopia.food_types.drinks")).formatted(Formatting.GRAY)); } diff --git a/src/main/java/com/minelittlepony/unicopia/diet/PonyDiets.java b/src/main/java/com/minelittlepony/unicopia/diet/PonyDiets.java index 658cdf53..8e4558a9 100644 --- a/src/main/java/com/minelittlepony/unicopia/diet/PonyDiets.java +++ b/src/main/java/com/minelittlepony/unicopia/diet/PonyDiets.java @@ -82,6 +82,15 @@ public class PonyDiets implements DietView { tooltip.add(Text.translatable("unicopia.diet.information").formatted(Formatting.DARK_PURPLE)); getEffects(stack, pony).appendTooltip(stack, tooltip, context); + + /*for (Race race : Race.REGISTRY) { + var diet = diets.get(race); + if (diet != null) { + tooltip.add(race.getDisplayName()); + diet.appendTooltip(stack, user, tooltip, context); + } + }*/ + getDiet(pony).appendTooltip(stack, user, tooltip, context); } } diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 525c448b..21b3273e 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -622,6 +622,9 @@ "tag.unicopia.food_types.shelly": "Sea Shells", "tag.unicopia.food_types.candy": "Candy", "tag.unicopia.food_types.desserts": "Desserts", + "tag.unicopia.food_types.fruit": "Fruit", + "tag.unicopia.food_types.baked_goods": "Baked Goods", + "tag.unicopia.food_types.misc": "Misc", "tag.unicopia.food_types.fruits_and_vegetables": "Fruits & Vegetables", "tag.unicopia.food_types.drinks": "Drinks", "tag.minecraft.leaves": "Leaves", diff --git a/src/main/resources/data/c/tags/items/fruits.json b/src/main/resources/data/c/tags/items/fruits.json index 6cd22ee2..696b1906 100644 --- a/src/main/resources/data/c/tags/items/fruits.json +++ b/src/main/resources/data/c/tags/items/fruits.json @@ -2,7 +2,8 @@ "replace": false, "values": [ "unicopia:mango", - "unicopia:banana", - "unicopia:pineapple" + "#c:pineapples", + "#c:apples", + "#c:bananas" ] } diff --git a/src/main/resources/data/unicopia/diets/food_effects/baked_goods.json b/src/main/resources/data/unicopia/diets/food_effects/baked_goods.json new file mode 100644 index 00000000..31306e54 --- /dev/null +++ b/src/main/resources/data/unicopia/diets/food_effects/baked_goods.json @@ -0,0 +1,11 @@ +{ + "tags": [ "unicopia:food_types/baked_goods" ], + "food_component": { + "hunger": 1, + "saturation": 1 + }, + "ailment": { + "effects": [ + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/diets/food_effects/candy.json b/src/main/resources/data/unicopia/diets/food_effects/candy.json new file mode 100644 index 00000000..a7d7d64b --- /dev/null +++ b/src/main/resources/data/unicopia/diets/food_effects/candy.json @@ -0,0 +1,11 @@ +{ + "tags": [ "unicopia:food_types/candy" ], + "food_component": { + "hunger": 1, + "saturation": 1 + }, + "ailment": { + "effects": [ + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/diets/food_effects/desserts.json b/src/main/resources/data/unicopia/diets/food_effects/desserts.json new file mode 100644 index 00000000..63913e02 --- /dev/null +++ b/src/main/resources/data/unicopia/diets/food_effects/desserts.json @@ -0,0 +1,11 @@ +{ + "tags": [ "unicopia:food_types/desserts" ], + "food_component": { + "hunger": 1, + "saturation": 1 + }, + "ailment": { + "effects": [ + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/diets/food_effects/fruit.json b/src/main/resources/data/unicopia/diets/food_effects/fruit.json new file mode 100644 index 00000000..20793232 --- /dev/null +++ b/src/main/resources/data/unicopia/diets/food_effects/fruit.json @@ -0,0 +1,11 @@ +{ + "tags": [ "unicopia:food_types/fruit" ], + "food_component": { + "hunger": 1, + "saturation": 1 + }, + "ailment": { + "effects": [ + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/diets/races/alicorn.json b/src/main/resources/data/unicopia/diets/races/alicorn.json index d318454c..caf175c1 100644 --- a/src/main/resources/data/unicopia/diets/races/alicorn.json +++ b/src/main/resources/data/unicopia/diets/races/alicorn.json @@ -1,6 +1,6 @@ { - "default_multiplier": 0.8, - "foraging_multiplier": 1, + "default_multiplier": 1.4, + "foraging_multiplier": 0.9, "multipliers": [ { "tags": [ "unicopia:food_types/cooked_fish" ], @@ -12,6 +12,13 @@ "hunger": 0.5, "saturation": 0.6 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1, + "saturation": 1 + }, { "tags": [ "unicopia:food_types/cooked_insect", diff --git a/src/main/resources/data/unicopia/diets/races/bat.json b/src/main/resources/data/unicopia/diets/races/bat.json index 2aedf250..283a8788 100644 --- a/src/main/resources/data/unicopia/diets/races/bat.json +++ b/src/main/resources/data/unicopia/diets/races/bat.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0.5, + "default_multiplier": 0.6, "foraging_multiplier": 0.9, "multipliers": [ { diff --git a/src/main/resources/data/unicopia/diets/races/changeling.json b/src/main/resources/data/unicopia/diets/races/changeling.json index 8b108468..d728f503 100644 --- a/src/main/resources/data/unicopia/diets/races/changeling.json +++ b/src/main/resources/data/unicopia/diets/races/changeling.json @@ -27,6 +27,13 @@ "hunger": 0.6, "saturation": 0.6 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 0.5, + "saturation": 0.9 + }, { "tags": [ "unicopia:food_types/love" ], "hunger": 1, diff --git a/src/main/resources/data/unicopia/diets/races/earth.json b/src/main/resources/data/unicopia/diets/races/earth.json index a8b48e87..e06a0fd5 100644 --- a/src/main/resources/data/unicopia/diets/races/earth.json +++ b/src/main/resources/data/unicopia/diets/races/earth.json @@ -1,5 +1,5 @@ { - "default_multiplier": 1, + "default_multiplier": 0.7, "foraging_multiplier": 1, "multipliers": [ { @@ -11,6 +11,13 @@ "hunger": 2.5, "saturation": 1.7 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1.2, + "saturation": 2 + }, { "tags": [ "unicopia:food_types/cooked_fish" ], "hunger": 0.2, diff --git a/src/main/resources/data/unicopia/diets/races/hippogriff.json b/src/main/resources/data/unicopia/diets/races/hippogriff.json index 8ecea1ad..f20a092a 100644 --- a/src/main/resources/data/unicopia/diets/races/hippogriff.json +++ b/src/main/resources/data/unicopia/diets/races/hippogriff.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0.3, + "default_multiplier": 0.5, "foraging_multiplier": 0.8, "multipliers": [ { @@ -10,6 +10,13 @@ "hunger": 1.6, "saturation": 1.6 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1, + "saturation": 1 + }, { "tags": [ "unicopia:food_types/raw_meat", diff --git a/src/main/resources/data/unicopia/diets/races/kirin.json b/src/main/resources/data/unicopia/diets/races/kirin.json index 2f2f4172..42b41a67 100644 --- a/src/main/resources/data/unicopia/diets/races/kirin.json +++ b/src/main/resources/data/unicopia/diets/races/kirin.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0, + "default_multiplier": 0.25, "foraging_multiplier": 0.9, "multipliers": [ { @@ -12,6 +12,13 @@ "hunger": 0.5, "saturation": 0.6 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1, + "saturation": 1 + }, { "tags": [ "unicopia:food_types/cooked_insect", diff --git a/src/main/resources/data/unicopia/diets/races/pegasus.json b/src/main/resources/data/unicopia/diets/races/pegasus.json index da8220b7..d1208202 100644 --- a/src/main/resources/data/unicopia/diets/races/pegasus.json +++ b/src/main/resources/data/unicopia/diets/races/pegasus.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0.5, + "default_multiplier": 0.9, "foraging_multiplier": 1, "multipliers": [ { @@ -12,6 +12,13 @@ "hunger": 0.5, "saturation": 0.6 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1, + "saturation": 1 + }, { "tags": [ "unicopia:food_types/cooked_insect", diff --git a/src/main/resources/data/unicopia/diets/races/seapony.json b/src/main/resources/data/unicopia/diets/races/seapony.json index 4bf9a4cb..6558338a 100644 --- a/src/main/resources/data/unicopia/diets/races/seapony.json +++ b/src/main/resources/data/unicopia/diets/races/seapony.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0.5, + "default_multiplier": 0.4, "foraging_multiplier": 0.7, "multipliers": [ { diff --git a/src/main/resources/data/unicopia/diets/races/unicorn.json b/src/main/resources/data/unicopia/diets/races/unicorn.json index 866ba9e2..be679a08 100644 --- a/src/main/resources/data/unicopia/diets/races/unicorn.json +++ b/src/main/resources/data/unicopia/diets/races/unicorn.json @@ -1,5 +1,5 @@ { - "default_multiplier": 0.7, + "default_multiplier": 1.2, "foraging_multiplier": 1, "multipliers": [ { @@ -11,6 +11,13 @@ "hunger": 0.1, "saturation": 0.1 }, + { + "tags": [ + "unicopia:food_types/baked_goods" + ], + "hunger": 1, + "saturation": 1 + }, { "tags": [ "unicopia:food_types/love", diff --git a/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json b/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json new file mode 100644 index 00000000..02828b2e --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/food_types/baked_goods.json @@ -0,0 +1,27 @@ +{ + "replace": false, + "values": [ + "minecraft:bread", + "minecraft:cookie", + "unicopia:muffin", + "#c:grain", + "unicopia:cooked_zap_apple", + "minecraft:pumpkin_pie", + "#unicopia:pies", + "unicopia:apple_pie_slice", + "unicopia:toast", + "unicopia:burned_toast", + "unicopia:jam_toast", + "unicopia:imported_oats", + "unicopia:oatmeal", + "unicopia:hay_fries", + "unicopia:crispy_hay_fries", + "unicopia:horse_shoe_fries", + { "id": "farmersdelight:wheat_dough", "required": false }, + { "id": "farmersdelight:raw_pasta", "required": false }, + { "id": "farmersdelight:pie_crust", "required": false }, + { "id": "farmersdelight:sweet_berry_cookie", "required": false }, + { "id": "farmersdelight:honey_cookie", "required": false }, + { "id": "farmersdelight:egg_sandwich", "required": false } + ] +} diff --git a/src/main/resources/data/unicopia/tags/items/food_types/desserts.json b/src/main/resources/data/unicopia/tags/items/food_types/desserts.json index 0e14adc0..c88f3f26 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/desserts.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/desserts.json @@ -2,7 +2,11 @@ "replace": false, "values": [ "minecraft:cake", - "#unicopia:pies", - { "id": "bakersdelight:sweet_berry_cheesecake", "required": false } + { "id": "farmersdelight:sweet_berry_cheesecake", "required": false }, + { "id": "farmersdelight:sweet_berry_cheesecake_slice", "required": false }, + { "id": "farmersdelight:chocolate_pie_slice", "required": false }, + { "id": "farmersdelight:cake_slice", "required": false }, + { "id": "farmersdelight:apple_pie_slice", "required": false }, + { "id": "farmersdelight:glow_berry_custard", "required": false } ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/fruit.json b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json new file mode 100644 index 00000000..b3f9d285 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + "#c:fruits", + "unicopia:zap_apple", + "unicopia:zap_bulb", + "unicopia:rotten_apple", + "minecraft:melon_slice", + "minecraft:sweet_berries", + "minecraft:glow_berries", + "minecraft:chorus_fruit", + "unicopia:juice", + { "id": "farmersdelight:pumpkin_slice", "required": false }, + { "id": "farmersdelight:tomato", "required": false }, + { "id": "farmersdelight:melon_juice", "required": false }, + { "id": "farmersdelight:fruit_salad", "required": false } + ] +} From 9eb0a0028bcc57b2d6148e00cf3a11d3161c4eb3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 9 Mar 2024 21:57:44 +0000 Subject: [PATCH 07/44] Add enchantment descriptions support --- src/main/resources/assets/unicopia/lang/en_us.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 21b3273e..90c0cac7 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -1310,16 +1310,27 @@ "key.unicopia.hud_page_up": "Hud Next Page", "enchantment.unicopia.gem_finder": "Gem Finder", + "enchantment.unicopia.gem_finder.desc": "Produces a low hum when you get close to high-value ores", "enchantment.unicopia.padded": "Padded", - "enchantment.unicopia.clingy": "Clings", + "enchantment.unicopia.padded.dec": "Protects pegasi from impacts by making them bounce off walls", + "enchantment.unicopia.clingy": "Clingy", + "enchantment.unicopia.clingy.desc": "Causes items to follow the player when dropped", "enchantment.unicopia.repulsion": "Repulsion", + "enchantment.unicopia.repulsion.desc": "Decreases the wearer's gravity", "enchantment.unicopia.heavy": "Heavy", + "enchantment.unicopia.heavy.desc": "Makes pegasi wearing armor heavier and less likely to be pushed around by magic and wind", "enchantment.unicopia.herds": "Herds", + "enchantment.unicopia.herds.desc": "Makes a weapon stronger the more allied forces are around", "enchantment.unicopia.want_it_need_it": "Want It Need It", + "enchantment.unicopia.want_it_need_it.desc": "Makes the item irresistable to mobs", "enchantment.unicopia.poisoned_joke": "Poisoned Joke", + "enchantment.unicopia.poisoned_joke.desc": "Causes auditory hallucinations to whoever is carrying an item", "enchantment.unicopia.stressed": "Stressed", + "enchantment.unicopia.stressed.desc": "Causes the screen to shake when you are in danger", "enchantment.unicopia.heart_bound": "Heart Bound", + "enchantment.unicopia.heart_bound.desc": "Causes an item to stay with you after you die", "enchantment.unicopia.consumption": "Consumption", + "enchantment.unicopia.consumption.desc": "Converts drops mined using a tool into raw experience", "commands.race.success.self": "Set own race to %1$s", "commands.race.success": "%1$s changed race to %2$s", From 0e45d9379b017a9cade931d4b21aa366a9ebc858 Mon Sep 17 00:00:00 2001 From: Cryghast Date: Tue, 12 Mar 2024 17:56:08 +0800 Subject: [PATCH 08/44] update zh_cn.json --- .../resources/assets/unicopia/lang/zh_cn.json | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/unicopia/lang/zh_cn.json b/src/main/resources/assets/unicopia/lang/zh_cn.json index 295bfc97..9da5f8b3 100644 --- a/src/main/resources/assets/unicopia/lang/zh_cn.json +++ b/src/main/resources/assets/unicopia/lang/zh_cn.json @@ -228,6 +228,7 @@ "block.unicopia.spectral_fire": "节律火", "block.unicopia.bananas": "香蕉", "block.unicopia.zapling": "魔虹苹果树苗", + "block.unicopia.potted_zapling": "盆中 魔虹苹果树苗", "block.unicopia.zap_log": "魔虹苹果木原木", "block.unicopia.zap_wood": "魔虹苹果木", "block.unicopia.stripped_zap_log": "去皮魔虹苹果木原木", @@ -251,6 +252,7 @@ "block.unicopia.zap_apple": "魔虹苹果", "block.unicopia.zap_bulb": "没熟的魔虹苹果", "block.unicopia.palm_sapling": "棕榈树苗", + "block.unicopia.potted_palm_sapling": "盆中 棕榈树苗", "block.unicopia.palm_log": "棕榈木原木", "block.unicopia.palm_wood": "棕榈木", "block.unicopia.palm_planks": "棕榈木板", @@ -273,11 +275,13 @@ "block.unicopia.gold_root": "黄金根", "block.unicopia.golden_oak_sprout": "金橡树嫩芽", "block.unicopia.golden_oak_sapling": "金橡树树苗", + "block.unicopia.potted_golden_oak_sapling": "盆中 金橡树树苗", "block.unicopia.golden_oak_leaves": "金橡树树叶", "block.unicopia.golden_oak_log": "金橡树原木", "block.unicopia.mango": "芒果", "block.unicopia.mango_leaves": "芒果树叶", "block.unicopia.mango_sapling": "芒果树苗", + "block.unicopia.potted_mango_sapling": "盆中 芒果树苗", "block.unicopia.pineapple": "菠萝树", "block.unicopia.clam_shell": "蛤蜊壳", @@ -286,12 +290,15 @@ "block.unicopia.green_apple_leaves": "史密斯婆婆苹果树树叶", "block.unicopia.green_apple_sapling": "史密斯婆婆苹果树树苗", + "block.unicopia.potted_green_apple_sapling": "盆中 史密斯婆婆苹果树树苗", "block.unicopia.green_apple_sprout": "史密斯婆婆苹果嫩芽", "block.unicopia.sweet_apple_leaves": "甜苹果树树叶", "block.unicopia.sweet_apple_sapling": "甜苹果树树苗", + "block.unicopia.potted_sweet_apple_sapling": "盆中 甜苹果树树苗", "block.unicopia.sweet_apple_sprout": "甜苹果树嫩芽", "block.unicopia.sour_apple_leaves": "酸苹果树树叶", "block.unicopia.sour_apple_sapling": "酸苹果树树苗", + "block.unicopia.potted_sour_apple_sapling": "盆中 酸苹果树树苗", "block.unicopia.sour_apple_sprout": "酸苹果树嫩芽", "block.unicopia.surface_chitin": "几丁质表面", @@ -615,6 +622,9 @@ "tag.unicopia.food_types.shelly": "海贝", "tag.unicopia.food_types.candy": "糖果", "tag.unicopia.food_types.desserts": "甜品", + "tag.unicopia.food_types.fruit": "水果", + "tag.unicopia.food_types.baked_goods": "烤过的东西", + "tag.unicopia.food_types.misc": "杂项", "tag.unicopia.food_types.fruits_and_vegetables": "水果和蔬菜", "tag.unicopia.food_types.drinks": "饮品", "tag.minecraft.leaves": "叶子", @@ -1300,17 +1310,28 @@ "key.unicopia.hud_page_up": "切换Hud至下一页", "enchantment.unicopia.gem_finder": "矿石探测", + "enchantment.unicopia.gem_finder.desc": "在你靠近高价值矿物时发出嗡嗡声", "enchantment.unicopia.padded": "防撞软垫", + "enchantment.unicopia.padded.dec": "使得天马在撞到墙上时能从其上弹开", "enchantment.unicopia.clingy": "纠缠不休", + "enchantment.unicopia.clingy.desc": "使掉落的物品向玩家靠近", "enchantment.unicopia.repulsion": "地心斥力", + "enchantment.unicopia.repulsion.desc": "减少穿戴者自身的引力", "enchantment.unicopia.heavy": "沉重", + "enchantment.unicopia.heavy.desc": "使穿着盔甲的天马更加沉重，更难被疾风和魔法摆弄", "enchantment.unicopia.herds": "戮力同心", + "enchantment.unicopia.herds.desc": "周围同伴越多，武器越强", "enchantment.unicopia.want_it_need_it": "竞相争夺", + "enchantment.unicopia.want_it_need_it.desc": "其他生物难以抗拒此物品的诱惑", "enchantment.unicopia.poisoned_joke": "毒玩笑", + "enchantment.unicopia.poisoned_joke.desc": "持有此物品者会幻听", "enchantment.unicopia.stressed": "神经压迫", + "enchantment.unicopia.stressed.desc": "身处危险时，使你视角抖动", "enchantment.unicopia.heart_bound": "心灵绑定", + "enchantment.unicopia.heart_bound.desc": "你死亡后，物品仍与你同在", "enchantment.unicopia.consumption": "经验提取", - + "enchantment.unicopia.consumption.desc": "用工具挖掘时，产出经验球而不是掉落物", + "commands.race.success.self": "将自己的种族设置为 %1$s", "commands.race.success": "%1$s 将种族改变为了 %2$s", "commands.race.success.other": "已将 %1$s 的种族改变为 %2$s", From dce29e46a6b657a0a74a40cfd641036bbe93606e Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 11:57:15 +0000 Subject: [PATCH 09/44] Fix teleportation issues which puts the player inside blocks/in the air above leaves/prevents teleporting to snow covered blocks --- .../ability/UnicornTeleportAbility.java | 55 +++++++++++++------ 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java index 1f9c411e..ea81884b 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java @@ -16,6 +16,9 @@ import com.minelittlepony.unicopia.particle.MagicParticleEffect; import com.minelittlepony.unicopia.util.Trace; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.LeavesBlock; +import net.minecraft.block.PowderSnowBlock; import net.minecraft.block.ShapeContext; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -78,8 +81,7 @@ public class UnicornTeleportAbility implements Ability { return Optional.empty(); } - int maxDistance = player.asEntity().isCreative() ? 1000 : 100; - + int maxDistance = (int)((player.asEntity().isCreative() ? 1000 : 100) + (player.getLevel().get() * 0.25F)); World w = player.asWorld(); @@ -87,10 +89,16 @@ public class UnicornTeleportAbility implements Ability { return trace.getBlockOrEntityPos().map(pos -> { final BlockPos originalPos = pos; - boolean airAbove = enterable(w, pos.up()) && enterable(w, pos.up(2)); + boolean originalPosHasSupport = exception(w, pos, player.asEntity()); + boolean originalPosValid = enterable(w, pos.up()) && enterable(w, pos.up(2)); - if (exception(w, pos, player.asEntity())) { + if (w.getBlockState(pos).isOf(Blocks.POWDER_SNOW) && !PowderSnowBlock.canWalkOnPowderSnow(player.asEntity())) { + return null; + } + + if (originalPosHasSupport) { final BlockPos p = pos; + // offset to adjacent pos = trace.getSide().map(sideHit -> { if (player.asEntity().isSneaking()) { sideHit = sideHit.getOpposite(); @@ -100,15 +108,19 @@ public class UnicornTeleportAbility implements Ability { }).orElse(pos); } - if (enterable(w, pos.down())) { - pos = pos.down(); - - if (enterable(w, pos.down())) { - if (!airAbove) { - return null; + if (pos.getX() != originalPos.getX() || pos.getZ() != originalPos.getZ()) { + // check support + int steps = 0; + while (enterable(w, pos.down())) { + pos = pos.down(); + if (++steps > 2) { + if (originalPosValid) { + pos = originalPos.up(); + break; + } else { + return null; + } } - - pos = originalPos.up(2); } } @@ -162,11 +174,17 @@ public class UnicornTeleportAbility implements Ability { participant.getZ() - Math.floor(participant.getZ()) ); - Vec3d dest = destination.vec().add(offset); - - dest = new Vec3d(dest.x, getTargetYPosition(participant.getEntityWorld(), BlockPos.ofFloored(dest), ShapeContext.of(participant)), dest.z); - + double yPos = getTargetYPosition(participant.getEntityWorld(), destination.pos(), ShapeContext.of(participant)); + Vec3d dest = new Vec3d( + destination.x() + offset.getX(), + yPos, + destination.z() + offset.getZ() + ); participant.teleport(dest.x, dest.y, dest.z); + if (participant.getWorld().getBlockCollisions(participant, participant.getBoundingBox()).iterator().hasNext()) { + dest = destination.vec(); + participant.teleport(dest.x, participant.getY(), dest.z); + } teleporter.subtractEnergyCost(distance); participant.fallDistance /= distance; @@ -183,7 +201,10 @@ public class UnicornTeleportAbility implements Ability { private boolean enterable(World w, BlockPos pos) { BlockState state = w.getBlockState(pos); - return w.isAir(pos) || !state.isOpaque(); + if (StatePredicate.isFluid(state) || state.getBlock() instanceof LeavesBlock) { + return false; + } + return w.isAir(pos) || !state.isOpaque() || !state.shouldSuffocate(w, pos); } private boolean exception(World w, BlockPos pos, PlayerEntity player) { From 0e067e2a24314ecead2c94bea32312530685d316 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 11:57:39 +0000 Subject: [PATCH 10/44] Unicorn casting speed now scales with their level --- .../unicopia/ability/UnicornCastingAbility.java | 2 +- .../unicopia/ability/UnicornTeleportAbility.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java index 5726a36e..64a0e4bf 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java @@ -37,7 +37,7 @@ public class UnicornCastingAbility extends AbstractSpellCastingAbility { @Override public int getWarmupTime(Pony player) { - return 20; + return (int)(20 - Math.min(17F, player.getLevel().get() * 0.75F)); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java index ea81884b..3401632f 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/UnicornTeleportAbility.java @@ -51,12 +51,12 @@ public class UnicornTeleportAbility implements Ability { @Override public int getWarmupTime(Pony player) { - return 20; + return (int)(20 - Math.min(17F, player.getLevel().get() * 0.75F)); } @Override public int getCooldownTime(Pony player) { - return 50; + return (int)(50 - Math.min(45F, player.getLevel().get() * 0.75F)); } @Override From e5f2f696baa6fe9be502cdd27bb748dcdc09a5af Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 11:59:06 +0000 Subject: [PATCH 11/44] Unicorns no longer gain corruption when taking damage --- .../java/com/minelittlepony/unicopia/entity/player/Pony.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index 02c1d532..6f88a022 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -584,11 +584,6 @@ public class Pony extends Living implements Copyable, Update setDirty(); } } - - if (entity.hurtTime == 1 && getCompositeRace().physical().canCast()) { - corruption.add(1); - setDirty(); - } } } From f06dad53fc8aae381f5285774d197b93c774eb89 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 14:49:41 +0000 Subject: [PATCH 12/44] Update corruption mechanics. - Players no longer gain corruption from taking damage, but - But spells with the dark alignment now cause more corruption and gaining corruption has side-effects not unlike the mild effects of wearing an alicorn amulet. - Every time a side-effect manifests, the player's corruption goes down. - Alicorn Amulet and Grogar's bell now cause more corruption Corrupt influence now clones mobs when they are damaged rather than just randomly. --- .../com/minelittlepony/unicopia/USounds.java | 2 +- .../ability/magic/SpellPredicate.java | 3 + .../SpellbookProfilePageContent.java | 9 +- .../unicopia/entity/Living.java | 6 ++ .../effect/CorruptInfluenceStatusEffect.java | 49 +++++++---- .../unicopia/entity/effect/UEffects.java | 8 ++ .../entity/player/CorruptionHandler.java | 84 +++++++++++++++++++ .../unicopia/entity/player/Pony.java | 30 +++---- .../unicopia/item/AlicornAmuletItem.java | 2 +- .../unicopia/item/BellItem.java | 4 +- .../resources/assets/unicopia/lang/en_us.json | 1 + .../resources/assets/unicopia/sounds.json | 19 +++++ 12 files changed, 180 insertions(+), 37 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/entity/player/CorruptionHandler.java diff --git a/src/main/java/com/minelittlepony/unicopia/USounds.java b/src/main/java/com/minelittlepony/unicopia/USounds.java index 3f53eca3..99117ddb 100644 --- a/src/main/java/com/minelittlepony/unicopia/USounds.java +++ b/src/main/java/com/minelittlepony/unicopia/USounds.java @@ -12,7 +12,7 @@ import static net.minecraft.sound.SoundEvents.*; public interface USounds { SoundEvent ENTITY_GENERIC_BUTTER_FINGERS = BLOCK_HONEY_BLOCK_SLIDE; - SoundEvent ENTITY_PLAYER_CORRUPTION = PARTICLE_SOUL_ESCAPE; + SoundEvent ENTITY_PLAYER_CORRUPTION = register("entity.player.corrupt"); SoundEvent ENTITY_PLAYER_BATPONY_SCREECH = register("entity.player.batpony.screech"); SoundEvent ENTITY_PLAYER_HIPPOGRIFF_SCREECH = register("entity.player.hippogriff.screech"); SoundEvent ENTITY_PLAYER_HIPPOGRIFF_PECK = ENTITY_CHICKEN_STEP; diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellPredicate.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellPredicate.java index 1e808801..3a7213c7 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellPredicate.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/SpellPredicate.java @@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.ability.magic; import java.util.UUID; import java.util.function.Predicate; +import com.minelittlepony.unicopia.Affinity; import com.minelittlepony.unicopia.ability.magic.spell.*; import com.minelittlepony.unicopia.ability.magic.spell.effect.MimicSpell; import com.minelittlepony.unicopia.ability.magic.spell.effect.ShieldSpell; @@ -21,6 +22,8 @@ public interface SpellPredicate extends Predicate { SpellPredicate IS_NOT_PLACED = IS_PLACED.negate(); SpellPredicate IS_VISIBLE = spell -> spell != null && !spell.isHidden(); + SpellPredicate IS_CORRUPTING = spell -> spell.getAffinity() == Affinity.BAD; + default SpellPredicate and(SpellPredicate predicate) { SpellPredicate self = this; return s -> self.test(s) && predicate.test(s); diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java index 6f3c2d08..65c6ebe2 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/spellbook/SpellbookProfilePageContent.java @@ -5,6 +5,7 @@ import java.util.List; import com.minelittlepony.common.client.gui.IViewRoot; import com.minelittlepony.common.client.gui.dimension.Bounds; import com.minelittlepony.unicopia.Race; +import com.minelittlepony.unicopia.ability.magic.SpellPredicate; import com.minelittlepony.unicopia.client.gui.*; import com.minelittlepony.unicopia.entity.player.*; import com.minelittlepony.unicopia.util.ColorHelper; @@ -43,7 +44,7 @@ public class SpellbookProfilePageContent implements SpellbookChapterList.Content .setTooltip(() -> List.of( Text.literal(String.format("Level %d ", pony.getLevel().get() + 1)).append(pony.getSpecies().getDisplayName()).formatted(pony.getSpecies().getAffinity().getColor()), Text.literal(String.format("Mana: %d%%", (int)(pony.getMagicalReserves().getMana().getPercentFill() * 100))), - Text.literal(String.format("Corruption: %d%%", (int)(pony.getCorruption().getScaled(100)))), + Text.literal(String.format("Corruption: %s%d%%", pony.getCorruptionhandler().hasCorruptingMagic() ? "^" : "", (int)(pony.getCorruption().getScaled(100)))), Text.literal(String.format("Experience: %d", (int)(pony.getMagicalReserves().getXp().getPercentFill() * 100))), Text.literal(String.format("Next level in: %dxp", 100 - (int)(pony.getMagicalReserves().getXp().getPercentFill() * 100))) )); @@ -108,7 +109,11 @@ public class SpellbookProfilePageContent implements SpellbookChapterList.Content int alpha = (int)(alphaF * 0x10) & 0xFF; int color = 0x10404000 | alpha; int xpColor = 0xAA0040FF | ((int)((0.3F + 0.7F * xpPercentage) * 0xFF) & 0xFF) << 16; - int manaColor = 0xFF00F040 | (int)((0.3F + 0.7F * alphaF) * 0x40) << 16; + int manaColor = 0xFF00F040; + if (pony.getSpellSlot().get(SpellPredicate.IS_CORRUPTING, false).isPresent()) { + manaColor = ColorHelper.lerp(Math.abs(MathHelper.sin(pony.asEntity().age / 15F)), manaColor, 0xFF0030F0); + } + manaColor |= (int)((0.3F + 0.7F * alphaF) * 0x40) << 16; DrawableUtil.drawArc(matrices, 0, radius + 24, 0, DrawableUtil.TAU, color, false); DrawableUtil.drawArc(matrices, radius / 3, radius + 6, 0, DrawableUtil.TAU, color, false); diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java index 40e9fc21..947a33be 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java @@ -23,6 +23,7 @@ import com.minelittlepony.unicopia.entity.behaviour.Guest; import com.minelittlepony.unicopia.entity.collision.MultiBoundingBoxEntity; import com.minelittlepony.unicopia.entity.damage.MagicalDamageSource; import com.minelittlepony.unicopia.entity.duck.LivingEntityDuck; +import com.minelittlepony.unicopia.entity.effect.CorruptInfluenceStatusEffect; import com.minelittlepony.unicopia.entity.effect.EffectUtils; import com.minelittlepony.unicopia.entity.effect.UEffects; import com.minelittlepony.unicopia.entity.player.Pony; @@ -49,6 +50,7 @@ import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.damage.DamageTypes; import net.minecraft.entity.data.*; +import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.item.BlockItem; @@ -521,6 +523,10 @@ public abstract class Living implements Equine, Caste } } + if (entity instanceof HostileEntity mob && mob.hasStatusEffect(UEffects.CORRUPT_INFLUENCE) && mob.getRandom().nextInt(4) == 0) { + CorruptInfluenceStatusEffect.reproduce(mob); + } + return Optional.empty(); } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/CorruptInfluenceStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/CorruptInfluenceStatusEffect.java index ebdd1a41..bf98ef9d 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/CorruptInfluenceStatusEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/CorruptInfluenceStatusEffect.java @@ -1,5 +1,7 @@ package com.minelittlepony.unicopia.entity.effect; +import java.util.UUID; + import org.jetbrains.annotations.Nullable; import com.minelittlepony.unicopia.Owned; @@ -13,6 +15,8 @@ import net.minecraft.entity.attribute.EntityAttributeModifier; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.effect.StatusEffect; import net.minecraft.entity.effect.StatusEffectCategory; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.WorldEvents; @@ -24,7 +28,6 @@ public class CorruptInfluenceStatusEffect extends StatusEffect { addAttributeModifier(EntityAttributes.GENERIC_ATTACK_SPEED, "6D706448-6A60-4F59-BE8A-C23A6DD2C7A9", 10, EntityAttributeModifier.Operation.ADDITION); } - @SuppressWarnings("unchecked") @Override public void applyUpdateEffect(LivingEntity entity, int amplifier) { @@ -32,7 +35,7 @@ public class CorruptInfluenceStatusEffect extends StatusEffect { return; } - if (entity instanceof HostileEntity) { + if (entity instanceof HostileEntity mob) { int nearby = entity.getWorld().getOtherEntities(entity, entity.getBoundingBox().expand(40), i -> i.getType() == entity.getType()).size(); @@ -48,25 +51,12 @@ public class CorruptInfluenceStatusEffect extends StatusEffect { return; } - HostileEntity mob = (HostileEntity)entity; + reproduce(mob); - HostileEntity clone = (HostileEntity)mob.getType().create(mob.getWorld()); - clone.copyPositionAndRotation(entity); - Equine.of(clone).ifPresent(eq -> { - if (eq instanceof Owned.Mutable) { - ((Owned.Mutable)eq).setMaster(mob); - } - }); - mob.getWorld().spawnEntity(clone); - - if (!mob.isSilent()) { - mob.getWorld().syncWorldEvent((PlayerEntity)null, WorldEvents.ZOMBIE_INFECTS_VILLAGER, mob.getBlockPos(), 0); - } } else if (entity.age % 2000 == 0) { entity.damage(Living.living(entity).damageOf(UDamageTypes.ALICORN_AMULET), 2); } - } @Override @@ -78,4 +68,31 @@ public class CorruptInfluenceStatusEffect extends StatusEffect { public boolean canApplyUpdateEffect(int duration, int amplifier) { return duration > 0; } + + public static void reproduce(HostileEntity mob) { + HostileEntity clone = (HostileEntity)mob.getType().create(mob.getWorld()); + clone.copyPositionAndRotation(mob); + clone.takeKnockback(0.1, 0.5, 0.5); + mob.takeKnockback(0.1, -0.5, -0.5); + if (mob.getRandom().nextInt(4) != 0) { + mob.clearStatusEffects(); + } else { + if (clone.getAttributes().hasAttribute(EntityAttributes.GENERIC_MAX_HEALTH)) { + float maxHealthDifference = mob.getMaxHealth() - clone.getMaxHealth(); + clone.addStatusEffect(new StatusEffectInstance(StatusEffects.STRENGTH, 900000, 2)); + clone.getAttributeInstance(EntityAttributes.GENERIC_MAX_HEALTH) + .addPersistentModifier(new EntityAttributeModifier(UUID.randomUUID(), "Corruption Strength Modifier", maxHealthDifference + 1, EntityAttributeModifier.Operation.ADDITION)); + } + if (clone.getAttributes().hasAttribute(EntityAttributes.GENERIC_ATTACK_DAMAGE)) { + clone.getAttributeInstance(EntityAttributes.GENERIC_ATTACK_DAMAGE) + .addPersistentModifier(new EntityAttributeModifier(UUID.randomUUID(), "Corruption Damage Modifier", mob.getAttributeValue(EntityAttributes.GENERIC_ATTACK_DAMAGE) + 1, EntityAttributeModifier.Operation.ADDITION)); + } + } + + mob.getWorld().spawnEntity(clone); + + if (!mob.isSilent()) { + mob.getWorld().syncWorldEvent((PlayerEntity)null, WorldEvents.ZOMBIE_INFECTS_VILLAGER, mob.getBlockPos(), 0); + } + } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/UEffects.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/UEffects.java index c7675ecf..00b51dd6 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/UEffects.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/UEffects.java @@ -10,8 +10,16 @@ import net.minecraft.registry.Registries; public interface UEffects { StatusEffect FOOD_POISONING = register("food_poisoning", new FoodPoisoningStatusEffect(3484199)); StatusEffect SUN_BLINDNESS = register("sun_blindness", new SunBlindnessStatusEffect(0x886F0F)); + /** + * Status effect emitted by players with a high level of corruption. + * When affecting an entity, will give them a random chance to reproduce or duplicate themselves when they die. + */ StatusEffect CORRUPT_INFLUENCE = register("corrupt_influence", new CorruptInfluenceStatusEffect(0x00FF00)); StatusEffect PARALYSIS = register("paralysis", new StatusEffect(StatusEffectCategory.HARMFUL, 0) {}); + /** + * Side-effect of wearing the alicorn amulet. + * Causes the player to lose grip on whatever item they're holding. + */ StatusEffect BUTTER_FINGERS = register("butter_fingers", new ButterfingersStatusEffect(0x888800)); private static StatusEffect register(String name, StatusEffect effect) { diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/CorruptionHandler.java b/src/main/java/com/minelittlepony/unicopia/entity/player/CorruptionHandler.java new file mode 100644 index 00000000..68a5d630 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/CorruptionHandler.java @@ -0,0 +1,84 @@ +package com.minelittlepony.unicopia.entity.player; + +import com.minelittlepony.unicopia.InteractionManager; +import com.minelittlepony.unicopia.ability.magic.SpellPredicate; +import com.minelittlepony.unicopia.entity.ItemTracker; +import com.minelittlepony.unicopia.entity.effect.UEffects; +import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.util.Tickable; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.math.random.Random; + +public class CorruptionHandler implements Tickable { + + private final Pony pony; + + public CorruptionHandler(Pony pony) { + this.pony = pony; + } + + public boolean hasCorruptingMagic() { + return pony.getSpellSlot().get(SpellPredicate.IS_CORRUPTING, false).isPresent() || UItems.ALICORN_AMULET.isApplicable(pony.asEntity()); + } + + @Override + public void tick() { + if (pony.isClient() || pony.asEntity().age % 5 != 0) { + return; + } + + PlayerEntity entity = pony.asEntity(); + Random random = pony.asEntity().getRandom(); + + if (!UItems.ALICORN_AMULET.isApplicable(entity)) { + if (entity.age % (10 * ItemTracker.SECONDS) == 0) { + if (random.nextInt(100) == 0) { + pony.getCorruption().add(-1); + pony.setDirty(); + } + + if (entity.getHealth() >= entity.getMaxHealth() - 1 && !entity.getHungerManager().isNotFull()) { + pony.getCorruption().add(-random.nextInt(4)); + pony.setDirty(); + } + } + } + + if (pony.asEntity().age % 100 == 0 && hasCorruptingMagic()) { + pony.getCorruption().add(random.nextInt(4)); + } + + float corruptionPercentage = pony.getCorruption().getScaled(1); + + if (corruptionPercentage > 0.5F && random.nextFloat() < corruptionPercentage - 0.25F) { + pony.findAllEntitiesInRange(10, e -> e instanceof LivingEntity && !((LivingEntity)e).hasStatusEffect(UEffects.CORRUPT_INFLUENCE)).forEach(e -> { + ((LivingEntity)e).addStatusEffect(new StatusEffectInstance(UEffects.CORRUPT_INFLUENCE, 100, 1)); + recover(10); + }); + } + + if (corruptionPercentage > 0.25F && random.nextInt(200) == 0) { + if (!pony.asEntity().hasStatusEffect(UEffects.BUTTER_FINGERS)) { + pony.asEntity().addStatusEffect(new StatusEffectInstance(UEffects.BUTTER_FINGERS, 2100, 1)); + recover(25); + } + } + + if (random.nextFloat() < corruptionPercentage) { + pony.spawnParticles(ParticleTypes.ASH, 10); + } + } + + private void recover(float percentage) { + pony.getCorruption().set((int)(pony.getCorruption().get() * (1 - percentage))); + InteractionManager.INSTANCE.playLoopingSound(pony.asEntity(), InteractionManager.SOUND_HEART_BEAT, 0); + MagicReserves reserves = pony.getMagicalReserves(); + reserves.getExertion().addPercent(10); + reserves.getEnergy().add(10); + pony.setDirty(); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index 6f88a022..3cb7f3cf 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -92,6 +92,7 @@ public class Pony extends Living implements Copyable, Update private final PlayerCamera camera = new PlayerCamera(this); private final TraitDiscovery discoveries = new TraitDiscovery(this); private final Acrobatics acrobatics = new Acrobatics(this); + private final CorruptionHandler corruptionHandler = new CorruptionHandler(this); private final Map advancementProgress = new HashMap<>(); @@ -129,6 +130,7 @@ public class Pony extends Living implements Copyable, Update addTicker(this::updateBatPonyAbilities); addTicker(this::updateCorruptionDecay); addTicker(new PlayerAttributes(this)); + addTicker(corruptionHandler); } @Override @@ -289,6 +291,10 @@ public class Pony extends Living implements Copyable, Update return corruption; } + public CorruptionHandler getCorruptionhandler() { + return corruptionHandler; + } + public boolean canUseSuperMove() { return entity.isCreative() || getMagicalReserves().getCharge().get() >= getMagicalReserves().getCharge().getMax(); } @@ -572,19 +578,7 @@ public class Pony extends Living implements Copyable, Update } private void updateCorruptionDecay() { - if (!isClient() && !UItems.ALICORN_AMULET.isApplicable(entity)) { - if (entity.age % (10 * ItemTracker.SECONDS) == 0) { - if (entity.getWorld().random.nextInt(100) == 0) { - corruption.add(-1); - setDirty(); - } - if (entity.getHealth() >= entity.getMaxHealth() - 1 && !entity.getHungerManager().isNotFull()) { - corruption.add(-entity.getWorld().random.nextInt(4)); - setDirty(); - } - } - } } @Override @@ -784,6 +778,12 @@ public class Pony extends Living implements Copyable, Update @Override public boolean subtractEnergyCost(double foodSubtract) { + if (getSpellSlot().get(SpellPredicate.IS_CORRUPTING, false).isPresent()) { + int corruptionTaken = (int)(foodSubtract * (AmuletSelectors.ALICORN_AMULET.test(entity) ? 0.9F : 0.5F)); + foodSubtract -= corruptionTaken; + getCorruption().add(corruptionTaken); + } + List partyMembers = FriendshipBraceletItem.getPartyMembers(this, 10).toList(); if (!partyMembers.isEmpty()) { @@ -951,10 +951,10 @@ public class Pony extends Living implements Copyable, Update @Override public void onSpellSet(@Nullable Spell spell) { if (spell != null) { - if (spell.getAffinity() == Affinity.BAD && entity.getWorld().random.nextInt(120) == 0) { - getCorruption().add(1); + if (spell.getAffinity() == Affinity.BAD && entity.getWorld().random.nextInt(20) == 0) { + getCorruption().add(entity.getRandom().nextBetween(1, 10)); } - getCorruption().add((int)spell.getTraits().getCorruption()); + getCorruption().add((int)spell.getTraits().getCorruption() * 10); setDirty(); } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java index 04722a09..b84967f1 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java @@ -234,7 +234,7 @@ public class AlicornAmuletItem extends AmuletItem implements ItemTracker.Trackab // butterfingers effects if (daysAttached >= 2) { if (pony.asWorld().random.nextInt(200) == 0 && !pony.asEntity().hasStatusEffect(UEffects.BUTTER_FINGERS)) { - pony.asEntity().addStatusEffect(new StatusEffectInstance(UEffects.CORRUPT_INFLUENCE, 2100, 1)); + pony.asEntity().addStatusEffect(new StatusEffectInstance(UEffects.BUTTER_FINGERS, 2100, 1)); } pony.findAllEntitiesInRange(10, e -> e instanceof LivingEntity && !((LivingEntity)e).hasStatusEffect(UEffects.CORRUPT_INFLUENCE)).forEach(e -> { diff --git a/src/main/java/com/minelittlepony/unicopia/item/BellItem.java b/src/main/java/com/minelittlepony/unicopia/item/BellItem.java index 472d1261..cf9af687 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/BellItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/BellItem.java @@ -57,7 +57,7 @@ public class BellItem extends Item implements ChargeableItem { public ActionResult useOnEntity(ItemStack stack, PlayerEntity player, LivingEntity target, Hand hand) { player.setCurrentHand(hand); Pony pony = Pony.of(player); - pony.getCorruption().add(1); + pony.getCorruption().add(1 + player.getRandom().nextBetween(1, 10)); pony.playSound(USounds.ITEM_GROGAR_BELL_USE, 0.4F, 0.2F); Living targetLiving = target instanceof MobEntity || target instanceof PlayerEntity ? Living.getOrEmpty(target) .filter(living -> !(living instanceof Creature c && c.isDiscorded())) @@ -79,7 +79,7 @@ public class BellItem extends Item implements ChargeableItem { if (hasCharge(stack)) { pony.playSound(USounds.ITEM_GROGAR_BELL_CHARGE, 0.6F, 1); - pony.getCorruption().add(1); + pony.getCorruption().add(player.getRandom().nextBetween(1, 10)); if (offhandStack.getItem() instanceof ChargeableItem chargeable) { float maxChargeBy = chargeable.getMaxCharge() - ChargeableItem.getEnergy(offhandStack); float energyTransferred = Math.min(ChargeableItem.getEnergy(stack), maxChargeBy); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 90c0cac7..b3280703 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -1547,6 +1547,7 @@ "unicopia.subtitle.pegasus.molt": "Pegasus loses feather", "unicopia.subtitle.unicorn.teleport": "Magic pops", "unicopia.subtitle.player.wololo": "Wololo!", + "unicopia.subtitle.corrupt": "Magic Corrupts", "unicopia.subtitle.entity.player.whistle": "Player whistles", "unicopia.subtitle.entity.player.kick": "Player kicks", "unicopia.subtitle.magic_aura": "Magic humming", diff --git a/src/main/resources/assets/unicopia/sounds.json b/src/main/resources/assets/unicopia/sounds.json index f914ffea..9b7eab3f 100644 --- a/src/main/resources/assets/unicopia/sounds.json +++ b/src/main/resources/assets/unicopia/sounds.json @@ -108,6 +108,25 @@ "unicopia:heartbeat/heartbeat_1" ] }, + "entity.player.corrupt": { + "category": "ambient", + "subtitle": "unicopia.subtitle.corrupt", + "sounds": [ + { "name": "enchant/soulspeed/soulspeed1", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed2", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed3", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed4", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed5", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed6", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed7", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed8", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed9", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed10", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed11", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed12", "volume": 0.25 }, + { "name": "enchant/soulspeed/soulspeed13", "volume": 0.25 } + ] + }, "ambient.wind.gust": { "category": "ambient", "subtitle": "unicopia.subtitle.wind_rush", From 53f7e34e596cf6c92475987b529ceaa79affcdc3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 14:50:01 +0000 Subject: [PATCH 13/44] Fix alignment of gemstones in the spell dismissal screen --- .../unicopia/client/gui/DismissSpellScreen.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/DismissSpellScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/DismissSpellScreen.java index 57ea2a25..8361a045 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/gui/DismissSpellScreen.java +++ b/src/main/java/com/minelittlepony/unicopia/client/gui/DismissSpellScreen.java @@ -163,15 +163,15 @@ public class DismissSpellScreen extends GameGui { @Override public void render(DrawContext context, int mouseX, int mouseY, float tickDelta) { MatrixStack matrices = context.getMatrices(); - copy.set(x, y, z, w); - copy.mul(matrices.peek().getPositionMatrix()); var type = actualSpell.getType().withTraits(actualSpell.getTraits()); - DrawableUtil.drawLine(matrices, 0, 0, (int)x, (int)y, 0xFFAAFF99); + copy.set(mouseX - width * 0.5F - x * 0.5F, mouseY - height * 0.5F - y * 0.5F, 0, 0); + + DrawableUtil.drawLine(matrices, 0, 0, (int)x, (int)y, actualSpell.getAffinity().getColor().getColorValue()); DrawableUtil.renderItemIcon(context, actualSpell.isDead() ? UItems.BOTCHED_GEM.getDefaultStack() : type.getDefaultStack(), - copy.x - 8 + copy.z / 20F, - copy.y - 8 + copy.z / 20F, + x - 8 - copy.x * 0.2F, + y - 8 - copy.y * 0.2F, 1 ); From 1c878be32458c1eaee4e6610ec4f32ebf49ebaab Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 14:52:48 +0000 Subject: [PATCH 14/44] Fixed overlay on summoned minions not rendering correctly and make it shift through different colours --- .../client/render/RenderLayerUtil.java | 24 +++++++++++ .../client/render/WorldRenderDelegate.java | 40 +++++-------------- .../unicopia/util/ColorHelper.java | 16 ++++++++ 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/RenderLayerUtil.java b/src/main/java/com/minelittlepony/unicopia/client/render/RenderLayerUtil.java index b230e769..1539a9ea 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/RenderLayerUtil.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/RenderLayerUtil.java @@ -1,14 +1,38 @@ package com.minelittlepony.unicopia.client.render; import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Function; + +import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.*; +import net.minecraft.client.render.VertexConsumerProvider.Immediate; +import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.Identifier; public interface RenderLayerUtil { + Identifier SHADOW_TEXTURE = new Identifier("textures/misc/shadow.png"); + static Optional getTexture(RenderLayer layer) { if (layer instanceof RenderLayer.MultiPhase multiphase) { return multiphase.getPhases().texture.getId(); } return Optional.empty(); } + + static void createUnionBuffer(Consumer action, VertexConsumerProvider vertices, Function overlayFunction) { + Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEffectVertexConsumers(); + action.accept(layer -> { + Identifier texture = RenderLayerUtil.getTexture(layer).orElse(null); + + if (texture == null || texture.equals(SHADOW_TEXTURE) || texture.equals(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE)) { + return vertices.getBuffer(layer); + } + return VertexConsumers.union( + vertices.getBuffer(layer), + immediate.getBuffer(overlayFunction.apply(texture)) + ); + }); + immediate.draw(); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java b/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java index 2d813635..ac9c3cdb 100644 --- a/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java +++ b/src/main/java/com/minelittlepony/unicopia/client/render/WorldRenderDelegate.java @@ -1,8 +1,6 @@ package com.minelittlepony.unicopia.client.render; import java.util.Optional; - -import com.minelittlepony.client.util.render.RenderLayerUtil; import com.minelittlepony.unicopia.EquinePredicates; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.Unicopia; @@ -14,6 +12,7 @@ import com.minelittlepony.unicopia.entity.ItemImpl; import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.entity.duck.LavaAffine; import com.minelittlepony.unicopia.entity.player.Pony; +import com.minelittlepony.unicopia.util.ColorHelper; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; @@ -24,14 +23,13 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.vehicle.BoatEntity; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.util.Identifier; -import net.minecraft.util.math.*; +import net.minecraft.util.math.RotationAxis; +import net.minecraft.util.math.Vec3d; public class WorldRenderDelegate { public static final WorldRenderDelegate INSTANCE = new WorldRenderDelegate(); private static final Optional RED_SKY_COLOR = Optional.of(new Vec3d(1, 0, 0)); - private static final Identifier SHADOW_TEXTURE = new Identifier("textures/misc/shadow.png"); private final EntityReplacementManager disguiseLookup = new EntityReplacementManager(); private final EntityDisguiseRenderer disguiseRenderer = new EntityDisguiseRenderer(this); @@ -72,23 +70,10 @@ public class WorldRenderDelegate { if (MinecraftClient.getInstance().getResourceManager().getResource(frostingTexture).isPresent()) { recurseFrosting = true; - - Immediate immediate = MinecraftClient.getInstance().getBufferBuilders().getEffectVertexConsumers(); - - client.getEntityRenderDispatcher().render(entity, x, y, z, yaw, tickDelta, matrices, layer -> { - - Identifier texture = RenderLayerUtil.getTexture(layer).orElse(null); - - if (texture == null || texture.equals(SHADOW_TEXTURE)) { - return vertices.getBuffer(layer); - } - return VertexConsumers.union( - vertices.getBuffer(layer), - immediate.getBuffer(RenderLayers.getEntityTranslucent(frostingTexture)) - ); - }, light); + RenderLayerUtil.createUnionBuffer(c -> { + client.getEntityRenderDispatcher().render(entity, x, y, z, yaw, tickDelta, matrices, c, light); + }, vertices, texture -> RenderLayers.getEntityTranslucent(frostingTexture)); recurseFrosting = false; - immediate.draw(); return true; } } @@ -146,16 +131,9 @@ public class WorldRenderDelegate { if (!recurseMinion && pony instanceof Creature creature && creature.isMinion()) { try { recurseMinion = true; - client.getEntityRenderDispatcher().render(creature.asEntity(), x, y, z, yaw, tickDelta, matrices, layer -> { - return RenderLayerUtil.getTexture(layer) - .filter(texture -> texture != PlayerScreenHandler.BLOCK_ATLAS_TEXTURE) - .map(texture -> { - return VertexConsumers.union( - vertices.getBuffer(layer), - vertices.getBuffer(RenderLayers.getMagicColored(texture, creature.isDiscorded() ? 0xCCFF0000 : 0xCC0000FF)) - ); - }).orElseGet(() -> vertices.getBuffer(layer)); - }, light); + RenderLayerUtil.createUnionBuffer(c -> { + client.getEntityRenderDispatcher().render(creature.asEntity(), x, y, z, yaw, tickDelta, matrices, c, light); + }, vertices, texture -> RenderLayers.getMagicColored(texture, creature.isDiscorded() ? 0x33FF0000 : ColorHelper.getRainbowColor(creature.asEntity(), 25, 1) )); // 0x8800AA00 return true; } catch (Throwable t) { Unicopia.LOGGER.error("Error whilst rendering minion", t); diff --git a/src/main/java/com/minelittlepony/unicopia/util/ColorHelper.java b/src/main/java/com/minelittlepony/unicopia/util/ColorHelper.java index 3e69ecc6..4db63857 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/ColorHelper.java +++ b/src/main/java/com/minelittlepony/unicopia/util/ColorHelper.java @@ -2,9 +2,25 @@ package com.minelittlepony.unicopia.util; import com.minelittlepony.common.util.Color; +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.SheepEntity; +import net.minecraft.util.DyeColor; import net.minecraft.util.math.MathHelper; public interface ColorHelper { + static int getRainbowColor(Entity entity, int speed, float tickDelta) { + int n = entity.age / speed + entity.getId(); + int o = DyeColor.values().length; + int p = n % o; + int q = (n + 1) % o; + float r = (entity.age % speed + tickDelta) / 25.0f; + float[] fs = SheepEntity.getRgbColor(DyeColor.byId(p)); + float[] gs = SheepEntity.getRgbColor(DyeColor.byId(q)); + float s = fs[0] * (1.0f - r) + gs[0] * r; + float t = fs[1] * (1.0f - r) + gs[1] * r; + float u = fs[2] * (1.0f - r) + gs[2] * r; + return Color.argbToHex(1, s, t, u); + } static float[] changeSaturation(float red, float green, float blue, float intensity) { float avg = (red + green + blue) / 3F; From 4d4647a3853d552688d7094503b024f699c5490d Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 17:57:09 +0000 Subject: [PATCH 15/44] Added a nuts food category for hippogriffs --- .../com/minelittlepony/unicopia/diet/DietProfile.java | 5 ++++- src/main/resources/assets/unicopia/lang/en_us.json | 1 + src/main/resources/data/c/tags/items/nuts.json | 6 ++++++ .../unicopia/diets/food_effects/nuts_and_seeds.json | 11 +++++++++++ .../data/unicopia/diets/races/hippogriff.json | 7 +++++++ .../data/unicopia/tags/items/food_types/fruit.json | 3 ++- .../tags/items/food_types/nuts_and_seeds.json | 11 +++++++++++ 7 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/data/c/tags/items/nuts.json create mode 100644 src/main/resources/data/unicopia/diets/food_effects/nuts_and_seeds.json create mode 100644 src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json diff --git a/src/main/java/com/minelittlepony/unicopia/diet/DietProfile.java b/src/main/java/com/minelittlepony/unicopia/diet/DietProfile.java index 104d6958..a71c8499 100644 --- a/src/main/java/com/minelittlepony/unicopia/diet/DietProfile.java +++ b/src/main/java/com/minelittlepony/unicopia/diet/DietProfile.java @@ -80,8 +80,11 @@ public record DietProfile( return null; } + float hunger = food.getHunger() * ratios.getFirst(); + int baseline = (int)hunger; + return FoodAttributes.copy(food) - .hunger(Math.max(1, (int)(food.getHunger() * ratios.getFirst()))) + .hunger(Math.max(1, (hunger - baseline) >= 0.5F ? baseline + 1 : baseline)) .saturationModifier(food.getSaturationModifier() * ratios.getSecond()) .build(); } diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index b3280703..9213335e 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -612,6 +612,7 @@ "tag.unicopia.food_types.cooked_fish": "Prepared Fish", "tag.unicopia.food_types.raw_insect": "Bugs & Insects", "tag.unicopia.food_types.cooked_insect": "Cooked Bugs & Insects", + "tag.unicopia.food_types.nuts_and_seeds": "Nuts & Seeds", "tag.unicopia.food_types.love": "Love", "tag.unicopia.food_types.rocks": "Rocks", "tag.unicopia.food_types.pinecone": "Nuts & Seeds", diff --git a/src/main/resources/data/c/tags/items/nuts.json b/src/main/resources/data/c/tags/items/nuts.json new file mode 100644 index 00000000..7fb489da --- /dev/null +++ b/src/main/resources/data/c/tags/items/nuts.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + { "id": "#c:crops/peanuts", "require": false } + ] +} diff --git a/src/main/resources/data/unicopia/diets/food_effects/nuts_and_seeds.json b/src/main/resources/data/unicopia/diets/food_effects/nuts_and_seeds.json new file mode 100644 index 00000000..30f205a2 --- /dev/null +++ b/src/main/resources/data/unicopia/diets/food_effects/nuts_and_seeds.json @@ -0,0 +1,11 @@ +{ + "tags": [ "unicopia:food_types/nuts_and_seeds" ], + "food_component": { + "hunger": 2, + "saturation": 2.5 + }, + "ailment": { + "effects": [ + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/diets/races/hippogriff.json b/src/main/resources/data/unicopia/diets/races/hippogriff.json index f20a092a..c91d791e 100644 --- a/src/main/resources/data/unicopia/diets/races/hippogriff.json +++ b/src/main/resources/data/unicopia/diets/races/hippogriff.json @@ -10,6 +10,13 @@ "hunger": 1.6, "saturation": 1.6 }, + { + "tags": [ + "unicopia:food_types/nuts_and_seeds" + ], + "hunger": 1.4, + "saturation": 1.4 + }, { "tags": [ "unicopia:food_types/baked_goods" diff --git a/src/main/resources/data/unicopia/tags/items/food_types/fruit.json b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json index b3f9d285..4421c2ff 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/fruit.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json @@ -13,6 +13,7 @@ { "id": "farmersdelight:pumpkin_slice", "required": false }, { "id": "farmersdelight:tomato", "required": false }, { "id": "farmersdelight:melon_juice", "required": false }, - { "id": "farmersdelight:fruit_salad", "required": false } + { "id": "farmersdelight:fruit_salad", "required": false }, + { "id": "#garnished:berries", "require": false } ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json b/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json new file mode 100644 index 00000000..20042716 --- /dev/null +++ b/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "#c:seeds", + "#c:acorns", + "#c:nuts", + { "id": "#garnished:nuts", "require": false }, + { "id": "#garnished:nut_mix", "require": false }, + { "id": "#garnished:neverable_delecacies", "require": false } + ] +} From 0ffedcf688b7f1f1a4845e2c81c74183f46438df Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2024 18:54:19 +0000 Subject: [PATCH 16/44] Set up datagen --- .gitignore | 1 + build.gradle | 19 ++ .../unicopia/datagen/Datagen.java | 17 ++ .../datagen/providers/ItemModels.java | 63 ++++++ .../datagen/providers/UModelProvider.java | 146 ++++++++++++ .../datagen/providers/URecipeProvider.java | 19 ++ .../unicopia/item/BedsheetsItem.java | 2 +- .../minelittlepony/unicopia/item/UItems.java | 2 +- .../unicopia/blockstates/palm_button.json | 118 ---------- .../unicopia/blockstates/palm_door.json | 124 ----------- .../unicopia/blockstates/palm_fence.json | 48 ---- .../unicopia/blockstates/palm_fence_gate.json | 80 ------- .../blockstates/palm_hanging_sign.json | 7 - .../unicopia/blockstates/palm_leaves.json | 7 - .../assets/unicopia/blockstates/palm_log.json | 16 -- .../unicopia/blockstates/palm_planks.json | 7 - .../blockstates/palm_pressure_plate.json | 10 - .../unicopia/blockstates/palm_sapling.json | 7 - .../unicopia/blockstates/palm_sign.json | 7 - .../unicopia/blockstates/palm_slab.json | 13 -- .../unicopia/blockstates/palm_stairs.json | 209 ------------------ .../unicopia/blockstates/palm_trapdoor.json | 58 ----- .../blockstates/palm_wall_hanging_sign.json | 7 - .../unicopia/blockstates/palm_wall_sign.json | 7 - .../unicopia/blockstates/palm_wood.json | 7 - .../blockstates/potted_palm_sapling.json | 7 - .../unicopia/blockstates/potted_zapling.json | 7 - .../blockstates/stripped_palm_log.json | 16 -- .../blockstates/stripped_palm_wood.json | 7 - .../blockstates/stripped_zap_log.json | 16 -- .../blockstates/stripped_zap_wood.json | 7 - .../blockstates/waxed_stripped_zap_log.json | 16 -- .../blockstates/waxed_stripped_zap_wood.json | 7 - .../unicopia/blockstates/waxed_zap_fence.json | 48 ---- .../blockstates/waxed_zap_fence_gate.json | 80 ------- .../unicopia/blockstates/waxed_zap_log.json | 16 -- .../blockstates/waxed_zap_planks.json | 7 - .../unicopia/blockstates/waxed_zap_slab.json | 13 -- .../blockstates/waxed_zap_stairs.json | 209 ------------------ .../unicopia/blockstates/waxed_zap_wood.json | 7 - .../unicopia/blockstates/zap_fence.json | 48 ---- .../unicopia/blockstates/zap_fence_gate.json | 80 ------- .../assets/unicopia/blockstates/zap_log.json | 16 -- .../unicopia/blockstates/zap_planks.json | 7 - .../assets/unicopia/blockstates/zap_slab.json | 13 -- .../unicopia/blockstates/zap_stairs.json | 209 ------------------ .../assets/unicopia/blockstates/zap_wood.json | 7 - .../assets/unicopia/blockstates/zapling.json | 7 - .../unicopia/models/block/palm_button.json | 6 - .../models/block/palm_button_inventory.json | 6 - .../models/block/palm_button_pressed.json | 6 - .../models/block/palm_door_bottom_left.json | 7 - .../block/palm_door_bottom_left_open.json | 7 - .../models/block/palm_door_bottom_right.json | 7 - .../block/palm_door_bottom_right_open.json | 7 - .../models/block/palm_door_top_left.json | 7 - .../models/block/palm_door_top_left_open.json | 7 - .../models/block/palm_door_top_right.json | 7 - .../block/palm_door_top_right_open.json | 7 - .../models/block/palm_fence_gate.json | 6 - .../models/block/palm_fence_gate_open.json | 6 - .../models/block/palm_fence_gate_wall.json | 6 - .../block/palm_fence_gate_wall_open.json | 6 - .../models/block/palm_fence_inventory.json | 6 - .../models/block/palm_fence_post.json | 6 - .../models/block/palm_fence_side.json | 6 - .../models/block/palm_hanging_sign.json | 5 - .../unicopia/models/block/palm_leaves.json | 6 - .../unicopia/models/block/palm_log.json | 7 - .../models/block/palm_log_horizontal.json | 7 - .../unicopia/models/block/palm_planks.json | 6 - .../models/block/palm_pressure_plate.json | 6 - .../block/palm_pressure_plate_down.json | 6 - .../unicopia/models/block/palm_sapling.json | 6 - .../unicopia/models/block/palm_sign.json | 5 - .../unicopia/models/block/palm_slab.json | 8 - .../unicopia/models/block/palm_slab_top.json | 8 - .../unicopia/models/block/palm_stairs.json | 8 - .../models/block/palm_stairs_inner.json | 8 - .../models/block/palm_stairs_outer.json | 8 - .../models/block/palm_trapdoor_bottom.json | 6 - .../models/block/palm_trapdoor_open.json | 6 - .../models/block/palm_trapdoor_top.json | 6 - .../unicopia/models/block/palm_wood.json | 6 - .../models/block/potted_palm_sapling.json | 6 - .../unicopia/models/block/potted_zapling.json | 6 - .../models/block/stripped_palm_log.json | 7 - .../block/stripped_palm_log_horizontal.json | 7 - .../models/block/stripped_palm_wood.json | 6 - .../models/block/stripped_zap_log.json | 7 - .../block/stripped_zap_log_horizontal.json | 7 - .../models/block/stripped_zap_wood.json | 6 - .../unicopia/models/block/zap_fence_gate.json | 6 - .../models/block/zap_fence_gate_open.json | 6 - .../models/block/zap_fence_gate_wall.json | 6 - .../block/zap_fence_gate_wall_open.json | 6 - .../models/block/zap_fence_inventory.json | 6 - .../unicopia/models/block/zap_fence_post.json | 6 - .../unicopia/models/block/zap_fence_side.json | 6 - .../assets/unicopia/models/block/zap_log.json | 7 - .../models/block/zap_log_horizontal.json | 7 - .../unicopia/models/block/zap_planks.json | 6 - .../unicopia/models/block/zap_slab.json | 8 - .../unicopia/models/block/zap_slab_top.json | 8 - .../unicopia/models/block/zap_stairs.json | 8 - .../models/block/zap_stairs_inner.json | 8 - .../models/block/zap_stairs_outer.json | 8 - .../unicopia/models/block/zap_wood.json | 6 - .../assets/unicopia/models/block/zapling.json | 6 - .../unicopia/models/item/acacia_basket.json | 6 - .../assets/unicopia/models/item/acorn.json | 6 - .../unicopia/models/item/alicorn_amulet.json | 6 - .../unicopia/models/item/alicorn_badge.json | 6 - .../models/item/apple_bed_sheets.json | 6 - .../unicopia/models/item/apple_pie.json | 6 - .../unicopia/models/item/apple_pie_hoof.json | 6 - .../unicopia/models/item/apple_pie_slice.json | 6 - .../unicopia/models/item/bamboo_basket.json | 6 - .../assets/unicopia/models/item/banana.json | 6 - .../models/item/barred_bed_sheets.json | 6 - .../unicopia/models/item/bat_badge.json | 6 - .../unicopia/models/item/birch_basket.json | 6 - .../models/item/black_bed_sheets.json | 6 - .../unicopia/models/item/blue_bed_sheets.json | 6 - .../unicopia/models/item/botched_gem.json | 6 - .../models/item/broken_alicorn_amulet.json | 6 - .../models/item/broken_sunglasses.json | 6 - .../models/item/brown_bed_sheets.json | 6 - .../unicopia/models/item/burned_juice.json | 6 - .../unicopia/models/item/burned_toast.json | 6 - .../models/item/butterfly_spawn_egg.json | 3 - .../assets/unicopia/models/item/carapace.json | 6 - .../models/item/changeling_badge.json | 6 - .../models/item/checkered_bed_sheets.json | 6 - .../unicopia/models/item/cherry_basket.json | 6 - .../assets/unicopia/models/item/cider.json | 6 - .../unicopia/models/item/clam_shell.json | 6 - .../unicopia/models/item/cloth_bed.json | 2 +- .../unicopia/models/item/cloud_bed.json | 2 +- .../unicopia/models/item/cloud_chest.json | 2 +- .../models/item/cooked_zap_apple.json | 6 - .../models/item/copper_horse_shoe.json | 6 - .../models/item/crispy_hay_fries.json | 6 - .../unicopia/models/item/crystal_heart.json | 6 - .../unicopia/models/item/crystal_shard.json | 6 - .../unicopia/models/item/curing_joke.json | 6 - .../unicopia/models/item/cyan_bed_sheets.json | 6 - .../models/item/daffodil_daisy_sandwich.json | 6 - .../unicopia/models/item/dark_oak_basket.json | 6 - .../unicopia/models/item/diamond_polearm.json | 14 -- .../item/diamond_polearm_in_inventory.json | 6 - .../models/item/diamond_polearm_throwing.json | 6 - .../models/item/dragon_breath_scroll.json | 6 - .../unicopia/models/item/earth_badge.json | 6 - .../unicopia/models/item/empty_jar.json | 6 - .../models/item/friendship_bracelet.json | 6 - .../unicopia/models/item/giant_balloon.json | 6 - .../unicopia/models/item/golden_feather.json | 6 - .../models/item/golden_horse_shoe.json | 6 - .../models/item/golden_oak_seeds.json | 6 - .../unicopia/models/item/golden_polearm.json | 14 -- .../item/golden_polearm_in_inventory.json | 6 - .../models/item/golden_polearm_throwing.json | 6 - .../unicopia/models/item/golden_wing.json | 6 - .../unicopia/models/item/gray_bed_sheets.json | 6 - .../unicopia/models/item/green_apple.json | 6 - .../models/item/green_apple_seeds.json | 6 - .../models/item/green_bed_sheets.json | 6 - .../unicopia/models/item/grogars_bell.json | 6 - .../unicopia/models/item/gryphon_feather.json | 6 - .../unicopia/models/item/hay_burger.json | 6 - .../unicopia/models/item/hay_fries.json | 6 - .../models/item/hippogriff_badge.json | 6 - .../models/item/horse_shoe_fries.json | 6 - .../unicopia/models/item/imported_oats.json | 6 - .../unicopia/models/item/iron_horse_shoe.json | 6 - .../unicopia/models/item/iron_polearm.json | 14 -- .../item/iron_polearm_in_inventory.json | 6 - .../models/item/iron_polearm_throwing.json | 6 - .../unicopia/models/item/jam_toast.json | 6 - .../assets/unicopia/models/item/juice.json | 6 - .../unicopia/models/item/jungle_basket.json | 6 - .../unicopia/models/item/kelp_bed_sheets.json | 6 - .../unicopia/models/item/kirin_badge.json | 6 - .../models/item/light_blue_bed_sheets.json | 6 - .../models/item/light_gray_bed_sheets.json | 6 - .../unicopia/models/item/lightning_jar.json | 6 - .../unicopia/models/item/lime_bed_sheets.json | 6 - .../models/item/loot_bug_spawn_egg.json | 3 - .../unicopia/models/item/love_bottle.json | 6 - .../unicopia/models/item/love_bucket.json | 6 - .../assets/unicopia/models/item/love_mug.json | 6 - .../models/item/magenta_bed_sheets.json | 6 - .../assets/unicopia/models/item/mango.json | 6 - .../unicopia/models/item/mangrove_basket.json | 6 - .../models/item/meadowbrooks_staff.json | 6 - .../assets/unicopia/models/item/muffin.json | 6 - .../models/item/music_disc_crusade.json | 6 - .../unicopia/models/item/music_disc_funk.json | 6 - .../unicopia/models/item/music_disc_pet.json | 6 - .../models/item/music_disc_popular.json | 6 - .../models/item/netherite_horse_shoe.json | 6 - .../models/item/netherite_polearm.json | 14 -- .../item/netherite_polearm_in_inventory.json | 6 - .../item/netherite_polearm_throwing.json | 6 - .../unicopia/models/item/oak_basket.json | 6 - .../unicopia/models/item/oat_seeds.json | 6 - .../assets/unicopia/models/item/oatmeal.json | 6 - .../assets/unicopia/models/item/oats.json | 6 - .../models/item/orange_bed_sheets.json | 6 - .../unicopia/models/item/palm_basket.json | 6 - .../unicopia/models/item/palm_boat.json | 6 - .../unicopia/models/item/palm_button.json | 3 - .../unicopia/models/item/palm_chest_boat.json | 6 - .../unicopia/models/item/palm_door.json | 6 - .../unicopia/models/item/palm_fence.json | 3 - .../unicopia/models/item/palm_fence_gate.json | 3 - .../models/item/palm_hanging_sign.json | 6 - .../unicopia/models/item/palm_leaves.json | 3 - .../assets/unicopia/models/item/palm_log.json | 3 - .../unicopia/models/item/palm_planks.json | 3 - .../models/item/palm_pressure_plate.json | 3 - .../unicopia/models/item/palm_sapling.json | 6 - .../unicopia/models/item/palm_sign.json | 6 - .../unicopia/models/item/palm_slab.json | 3 - .../unicopia/models/item/palm_stairs.json | 3 - .../unicopia/models/item/palm_trapdoor.json | 3 - .../unicopia/models/item/palm_wood.json | 3 - .../unicopia/models/item/pearl_necklace.json | 6 - .../assets/unicopia/models/item/pebbles.json | 6 - .../unicopia/models/item/pegasus_amulet.json | 6 - .../unicopia/models/item/pegasus_badge.json | 6 - .../unicopia/models/item/pegasus_feather.json | 6 - .../assets/unicopia/models/item/pinecone.json | 6 - .../unicopia/models/item/pink_bed_sheets.json | 6 - .../models/item/purple_bed_sheets.json | 6 - .../unicopia/models/item/rain_cloud_jar.json | 6 - .../models/item/rainbow_bed_sheets.json | 6 - .../models/item/rainbow_bpw_bed_sheets.json | 6 - .../models/item/rainbow_bpy_bed_sheets.json | 6 - .../models/item/rainbow_pbg_bed_sheets.json | 6 - .../models/item/rainbow_pwr_bed_sheets.json | 6 - .../unicopia/models/item/red_bed_sheets.json | 6 - .../assets/unicopia/models/item/rock.json | 6 - .../unicopia/models/item/rock_stew.json | 6 - .../unicopia/models/item/rotten_apple.json | 6 - .../unicopia/models/item/salt_cube.json | 6 - .../unicopia/models/item/scallop_shell.json | 6 - .../assets/unicopia/models/item/shelly.json | 6 - .../unicopia/models/item/sour_apple.json | 6 - .../models/item/sour_apple_seeds.json | 6 - .../unicopia/models/item/spellbook.json | 6 - .../unicopia/models/item/spruce_basket.json | 6 - .../unicopia/models/item/stone_polearm.json | 14 -- .../item/stone_polearm_in_inventory.json | 6 - .../models/item/stone_polearm_throwing.json | 6 - .../unicopia/models/item/storm_cloud_jar.json | 6 - .../models/item/stripped_palm_log.json | 3 - .../models/item/stripped_palm_wood.json | 3 - .../models/item/stripped_zap_log.json | 3 - .../models/item/stripped_zap_wood.json | 3 - .../unicopia/models/item/sweet_apple.json | 6 - .../models/item/sweet_apple_seeds.json | 6 - .../{amulet.json => template_amulet.json} | 0 .../item/{mug.json => template_mug.json} | 0 .../assets/unicopia/models/item/toast.json | 6 - .../assets/unicopia/models/item/tom.json | 6 - .../unicopia/models/item/turret_shell.json | 6 - .../unicopia/models/item/unicorn_amulet.json | 6 - .../unicopia/models/item/unicorn_badge.json | 6 - .../models/item/waxed_stripped_zap_log.json | 3 - .../models/item/waxed_stripped_zap_wood.json | 3 - .../unicopia/models/item/waxed_zap_fence.json | 3 - .../models/item/waxed_zap_fence_gate.json | 3 - .../unicopia/models/item/waxed_zap_log.json | 3 - .../models/item/waxed_zap_planks.json | 3 - .../unicopia/models/item/waxed_zap_slab.json | 3 - .../models/item/waxed_zap_stairs.json | 3 - .../unicopia/models/item/waxed_zap_wood.json | 3 - .../unicopia/models/item/weird_rock.json | 6 - .../unicopia/models/item/wheat_worms.json | 6 - .../unicopia/models/item/wooden_polearm.json | 14 -- .../item/wooden_polearm_in_inventory.json | 6 - .../models/item/wooden_polearm_throwing.json | 6 - .../models/item/yellow_bed_sheets.json | 6 - .../unicopia/models/item/zap_apple.json | 6 - .../models/item/zap_apple_jam_jar.json | 6 - .../assets/unicopia/models/item/zap_bulb.json | 6 - .../unicopia/models/item/zap_fence.json | 3 - .../unicopia/models/item/zap_fence_gate.json | 3 - .../assets/unicopia/models/item/zap_log.json | 3 - .../unicopia/models/item/zap_planks.json | 3 - .../assets/unicopia/models/item/zap_slab.json | 3 - .../unicopia/models/item/zap_stairs.json | 3 - .../assets/unicopia/models/item/zap_wood.json | 3 - .../assets/unicopia/models/item/zapling.json | 6 - .../textures/{item => block}/palm_sapling.png | Bin .../textures/{item => block}/zapling.png | Bin src/main/resources/fabric.mod.json | 3 + 299 files changed, 273 insertions(+), 3028 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_button.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_door.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_fence.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_hanging_sign.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_planks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_pressure_plate.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_sign.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_trapdoor.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_wall_hanging_sign.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_wall_sign.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_palm_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_zapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/stripped_palm_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/stripped_palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/stripped_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/stripped_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_fence.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_fence.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_planks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_button.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_button_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_button_pressed.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_bottom_left.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_bottom_left_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_bottom_right.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_bottom_right_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_top_left.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_top_left_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_top_right.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_door_top_right_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_gate_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_post.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_fence_side.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_hanging_sign.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_log.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_log_horizontal.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_pressure_plate.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_pressure_plate_down.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_sign.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_trapdoor_bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_trapdoor_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_trapdoor_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_palm_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_zapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_palm_log.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_palm_log_horizontal.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_zap_log_horizontal.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stripped_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_gate_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall_open.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_post.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_fence_side.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_log_horizontal.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/acacia_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/acorn.json delete mode 100644 src/main/resources/assets/unicopia/models/item/alicorn_amulet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/alicorn_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple_pie.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple_pie_slice.json delete mode 100644 src/main/resources/assets/unicopia/models/item/bamboo_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/banana.json delete mode 100644 src/main/resources/assets/unicopia/models/item/barred_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/bat_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/birch_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/black_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/blue_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/botched_gem.json delete mode 100644 src/main/resources/assets/unicopia/models/item/broken_alicorn_amulet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/broken_sunglasses.json delete mode 100644 src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/burned_juice.json delete mode 100644 src/main/resources/assets/unicopia/models/item/burned_toast.json delete mode 100644 src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json delete mode 100644 src/main/resources/assets/unicopia/models/item/carapace.json delete mode 100644 src/main/resources/assets/unicopia/models/item/changeling_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/checkered_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cherry_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cider.json delete mode 100644 src/main/resources/assets/unicopia/models/item/clam_shell.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/copper_horse_shoe.json delete mode 100644 src/main/resources/assets/unicopia/models/item/crispy_hay_fries.json delete mode 100644 src/main/resources/assets/unicopia/models/item/crystal_heart.json delete mode 100644 src/main/resources/assets/unicopia/models/item/crystal_shard.json delete mode 100644 src/main/resources/assets/unicopia/models/item/curing_joke.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dark_oak_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/diamond_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/diamond_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/diamond_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dragon_breath_scroll.json delete mode 100644 src/main/resources/assets/unicopia/models/item/earth_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/empty_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/friendship_bracelet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/giant_balloon.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_feather.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_horse_shoe.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_oak_seeds.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_wing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_apple_seeds.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/grogars_bell.json delete mode 100644 src/main/resources/assets/unicopia/models/item/gryphon_feather.json delete mode 100644 src/main/resources/assets/unicopia/models/item/hay_burger.json delete mode 100644 src/main/resources/assets/unicopia/models/item/hay_fries.json delete mode 100644 src/main/resources/assets/unicopia/models/item/hippogriff_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/horse_shoe_fries.json delete mode 100644 src/main/resources/assets/unicopia/models/item/imported_oats.json delete mode 100644 src/main/resources/assets/unicopia/models/item/iron_horse_shoe.json delete mode 100644 src/main/resources/assets/unicopia/models/item/iron_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/iron_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/iron_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/jam_toast.json delete mode 100644 src/main/resources/assets/unicopia/models/item/juice.json delete mode 100644 src/main/resources/assets/unicopia/models/item/jungle_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/kirin_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/lightning_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/loot_bug_spawn_egg.json delete mode 100644 src/main/resources/assets/unicopia/models/item/love_bottle.json delete mode 100644 src/main/resources/assets/unicopia/models/item/love_bucket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/love_mug.json delete mode 100644 src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/mango.json delete mode 100644 src/main/resources/assets/unicopia/models/item/mangrove_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/meadowbrooks_staff.json delete mode 100644 src/main/resources/assets/unicopia/models/item/muffin.json delete mode 100644 src/main/resources/assets/unicopia/models/item/music_disc_crusade.json delete mode 100644 src/main/resources/assets/unicopia/models/item/music_disc_funk.json delete mode 100644 src/main/resources/assets/unicopia/models/item/music_disc_pet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/music_disc_popular.json delete mode 100644 src/main/resources/assets/unicopia/models/item/netherite_horse_shoe.json delete mode 100644 src/main/resources/assets/unicopia/models/item/netherite_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/netherite_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/netherite_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/oak_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/oat_seeds.json delete mode 100644 src/main/resources/assets/unicopia/models/item/oatmeal.json delete mode 100644 src/main/resources/assets/unicopia/models/item/oats.json delete mode 100644 src/main/resources/assets/unicopia/models/item/orange_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_boat.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_button.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_chest_boat.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_door.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_fence.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_hanging_sign.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_pressure_plate.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_sign.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_trapdoor.json delete mode 100644 src/main/resources/assets/unicopia/models/item/palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pearl_necklace.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pebbles.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pegasus_amulet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pegasus_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pegasus_feather.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pinecone.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pink_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rain_cloud_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rainbow_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/red_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_stew.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rotten_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/salt_cube.json delete mode 100644 src/main/resources/assets/unicopia/models/item/scallop_shell.json delete mode 100644 src/main/resources/assets/unicopia/models/item/shelly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sour_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sour_apple_seeds.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spellbook.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spruce_basket.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stone_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stone_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stone_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/storm_cloud_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stripped_palm_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stripped_palm_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stripped_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stripped_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json rename src/main/resources/assets/unicopia/models/item/{amulet.json => template_amulet.json} (100%) rename src/main/resources/assets/unicopia/models/item/{mug.json => template_mug.json} (100%) delete mode 100644 src/main/resources/assets/unicopia/models/item/toast.json delete mode 100644 src/main/resources/assets/unicopia/models/item/tom.json delete mode 100644 src/main/resources/assets/unicopia/models/item/turret_shell.json delete mode 100644 src/main/resources/assets/unicopia/models/item/unicorn_amulet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/unicorn_badge.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_fence.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/weird_rock.json delete mode 100644 src/main/resources/assets/unicopia/models/item/wheat_worms.json delete mode 100644 src/main/resources/assets/unicopia/models/item/wooden_polearm.json delete mode 100644 src/main/resources/assets/unicopia/models/item/wooden_polearm_in_inventory.json delete mode 100644 src/main/resources/assets/unicopia/models/item/wooden_polearm_throwing.json delete mode 100644 src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple_jam_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_bulb.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_fence.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_fence_gate.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_wood.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zapling.json rename src/main/resources/assets/unicopia/textures/{item => block}/palm_sapling.png (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/zapling.png (100%) diff --git a/.gitignore b/.gitignore index f2cb75bf..89b57869 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ bin/ build/ run/ +generated/ .classpath .project *.launch diff --git a/build.gradle b/build.gradle index a24981db..51a392c2 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,18 @@ archivesBaseName = project.name loom { mixin.defaultRefmapName = 'unicopia.mixin.refmap.json' accessWidenerPath = file('src/main/resources/unicopia.aw') + runs { + datagen { + server() + name "Data Generation" + vmArg "-Dfabric-api.datagen" + vmArg "-Dfabric-api.datagen.modid=unicopia" + vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" + runDir "build/datagen" + } + } } +//assemble.dependsOn(runDatagen) reckon { scopeFromProp() @@ -97,6 +108,14 @@ dependencies { } } +sourceSets { + main { + resources { + srcDirs += [ "src/main/generated" ] + } + } +} + processResources { inputs.property "version", project.version.toString() diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java new file mode 100644 index 00000000..50ed2e3f --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -0,0 +1,17 @@ +package com.minelittlepony.unicopia.datagen; + +import com.minelittlepony.unicopia.datagen.providers.UModelProvider; +import com.minelittlepony.unicopia.datagen.providers.URecipeProvider; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class Datagen implements DataGeneratorEntrypoint { + @Override + public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { + final FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); + + pack.addProvider(UModelProvider::new); + pack.addProvider(URecipeProvider::new); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java new file mode 100644 index 00000000..d5e5a746 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java @@ -0,0 +1,63 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.Optional; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.minelittlepony.unicopia.Unicopia; + +import net.minecraft.data.client.ItemModelGenerator; +import net.minecraft.data.client.Model; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.TextureKey; +import net.minecraft.data.client.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; + +interface ItemModels { + Model GENERATED = net.minecraft.data.client.Models.GENERATED; + Model TEMPLATE_AMULET = item("template_amulet", TextureKey.LAYER0); + Model TEMPLATE_SPAWN_EGG = item(new Identifier("template_spawn_egg")); + Model TEMPLATE_MUG = item("template_mug", TextureKey.LAYER0); + Model HANDHELD_STAFF = item("handheld_staff", TextureKey.LAYER0); + Model TRIDENT_THROWING = item(new Identifier("trident_throwing"), TextureKey.LAYER0); + Model TRIDENT_IN_HAND = item(new Identifier("trident_in_hand"), TextureKey.LAYER0); + + static Model item(String parent, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(Unicopia.id("item/" + parent)), Optional.empty(), requiredTextureKeys); + } + + static Model item(Identifier parent, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(parent.withPrefixedPath("item/")), Optional.empty(), requiredTextureKeys); + } + + static void register(ItemModelGenerator itemModelGenerator, Item... items) { + register(itemModelGenerator, GENERATED, items); + } + + static void register(ItemModelGenerator itemModelGenerator, Model model, Item... items) { + for (Item item : items) { + itemModelGenerator.register(item, model); + } + } + + static void registerPolearm(ItemModelGenerator itemModelGenerator, Item item) { + TextureMap textures = TextureMap.layer0(TextureMap.getId(item)); + Identifier throwingId = ModelIds.getItemSubModelId(item, "_throwing"); + GENERATED.upload(ModelIds.getItemSubModelId(item, "_in_inventory"), textures, itemModelGenerator.writer); + TRIDENT_THROWING.upload(throwingId, textures, itemModelGenerator.writer); + TRIDENT_IN_HAND.upload(ModelIds.getItemModelId(item), textures, (id, jsonSupplier) -> { + itemModelGenerator.writer.accept(id, () -> Util.make(jsonSupplier.get(), json -> { + json.getAsJsonObject().add("overrides", Util.make(new JsonArray(), overrides -> { + overrides.add(Util.make(new JsonObject(), override -> { + override.addProperty("model", throwingId.toString()); + override.add("predicate", Util.make(new JsonObject(), predicate -> { + predicate.addProperty("throwing", 1); + })); + })); + })); + })); + }); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java new file mode 100644 index 00000000..397022b0 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -0,0 +1,146 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import com.minelittlepony.unicopia.Race; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.item.BedsheetsItem; +import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.server.world.UTreeGen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import net.minecraft.block.Block; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateModelGenerator.TintType; +import net.minecraft.data.family.BlockFamily; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import net.minecraft.data.client.ItemModelGenerator; +import net.minecraft.data.client.ModelIds; + +public class UModelProvider extends FabricModelProvider { + public UModelProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void generateBlockStateModels(BlockStateModelGenerator modelGenerator) { + // palm wood + registerLogSet(modelGenerator, UBlocks.PALM_LOG, UBlocks.PALM_WOOD); + registerLogSet(modelGenerator, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.PALM_PLANKS).family(new BlockFamily.Builder(UBlocks.PALM_PLANKS) + .slab(UBlocks.PALM_SLAB).stairs(UBlocks.PALM_STAIRS).fence(UBlocks.PALM_FENCE).fenceGate(UBlocks.PALM_FENCE_GATE) + .button(UBlocks.PALM_BUTTON).pressurePlate(UBlocks.PALM_PRESSURE_PLATE).sign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN) + .door(UBlocks.PALM_DOOR).trapdoor(UBlocks.PALM_TRAPDOOR) + .group("wooden").unlockCriterionName("has_planks") + .build()); + modelGenerator.registerHangingSign(UBlocks.STRIPPED_PALM_LOG, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); + modelGenerator.registerSimpleCubeAll(UBlocks.PALM_LEAVES); + modelGenerator.registerFlowerPotPlant(UTreeGen.BANANA_TREE.sapling().get(), UTreeGen.BANANA_TREE.pot().get(), TintType.NOT_TINTED); + + // zap wood + modelGenerator.registerLog(UBlocks.ZAP_LOG) + .log(UBlocks.ZAP_LOG).wood(UBlocks.ZAP_WOOD) + .log(UBlocks.WAXED_ZAP_LOG).wood(UBlocks.WAXED_ZAP_WOOD); + modelGenerator.registerLog(UBlocks.STRIPPED_ZAP_LOG) + .log(UBlocks.STRIPPED_ZAP_LOG).wood(UBlocks.STRIPPED_ZAP_WOOD) + .log(UBlocks.WAXED_STRIPPED_ZAP_LOG).wood(UBlocks.WAXED_STRIPPED_ZAP_WOOD); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.ZAP_PLANKS) + .family(new BlockFamily.Builder(UBlocks.ZAP_PLANKS) + .slab(UBlocks.ZAP_SLAB).stairs(UBlocks.ZAP_STAIRS).fence(UBlocks.ZAP_FENCE).fenceGate(UBlocks.ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build()) + .same(UBlocks.WAXED_ZAP_PLANKS).family(new BlockFamily.Builder(UBlocks.WAXED_ZAP_PLANKS) + .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build()); + modelGenerator.registerFlowerPotPlant(UTreeGen.ZAP_APPLE_TREE.sapling().get(), UTreeGen.ZAP_APPLE_TREE.pot().get(), TintType.NOT_TINTED); + } + + @Override + public void generateItemModels(ItemModelGenerator itemModelGenerator) { + ItemModels.register(itemModelGenerator, + UItems.ACORN, UItems.APPLE_PIE_HOOF, UItems.APPLE_PIE_SLICE, UItems.APPLE_PIE, + UItems.BANANA, UItems.BOTCHED_GEM, UItems.BROKEN_SUNGLASSES, UItems.BURNED_JUICE, UItems.BURNED_TOAST, + UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, UItems.CURING_JOKE, + UItems.DAFFODIL_DAISY_SANDWICH, UItems.DRAGON_BREATH_SCROLL, + UItems.EMPTY_JAR, + UItems.FRIENDSHIP_BRACELET, + UItems.GIANT_BALLOON, UItems.GOLDEN_FEATHER, UItems.GOLDEN_OAK_SEEDS, UItems.GOLDEN_WING, UItems.GREEN_APPLE_SEEDS, UItems.GREEN_APPLE, UItems.GROGARS_BELL, + UItems.GRYPHON_FEATHER, + UItems.HAY_BURGER, UItems.HAY_FRIES, UItems.HORSE_SHOE_FRIES, + UItems.IMPORTED_OATS, + UItems.JAM_TOAST, UItems.JUICE, + UItems.LIGHTNING_JAR, + UItems.MANGO, UItems.MUFFIN, + UItems.OAT_SEEDS, UItems.OATMEAL, UItems.OATS, + UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, + UItems.RAIN_CLOUD_JAR, UItems.ROCK_STEW, UItems.ROCK, UItems.ROTTEN_APPLE, + UItems.SALT_CUBE, UItems.SCALLOP_SHELL, UItems.SHELLY, UItems.SOUR_APPLE_SEEDS, UItems.SOUR_APPLE, UItems.SPELLBOOK, UItems.STORM_CLOUD_JAR, + UItems.SWEET_APPLE_SEEDS, UItems.SWEET_APPLE, + UItems.TOAST, UItems.TOM, UItems.TURRET_SHELL, + UItems.WEIRD_ROCK, UItems.WHEAT_WORMS, + UItems.ZAP_APPLE_JAM_JAR, UItems.ZAP_APPLE, UItems.ZAP_BULB, + + // discs + UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR, + + // baskets + UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, + UItems.DARK_OAK_BASKET, UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.SPRUCE_BASKET, + UItems.PALM_BASKET, + + // boats + UItems.PALM_BOAT, UItems.PALM_CHEST_BOAT, + + // horseshoes + UItems.COPPER_HORSE_SHOE, UItems.GOLDEN_HORSE_SHOE, UItems.IRON_HORSE_SHOE, UItems.NETHERITE_HORSE_SHOE + ); + + // spawn eggs + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_SPAWN_EGG, + UItems.BUTTERFLY_SPAWN_EGG, UItems.LOOT_BUG_SPAWN_EGG + ); + + // amulets + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_AMULET, + UItems.ALICORN_AMULET, UItems.BROKEN_ALICORN_AMULET, UItems.PEARL_NECKLACE, UItems.PEGASUS_AMULET, UItems.UNICORN_AMULET + ); + + // mugs + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_MUG, + UItems.CIDER, UItems.LOVE_BOTTLE, UItems.LOVE_BUCKET, UItems.LOVE_MUG, UItems.MUG + ); + + // staffs + ItemModels.register(itemModelGenerator, ItemModels.HANDHELD_STAFF, + UItems.MEADOWBROOKS_STAFF + ); + + // polearms + for (Item item : new Item[] { + UItems.DIAMOND_POLEARM, UItems.GOLDEN_POLEARM, UItems.NETHERITE_POLEARM, UItems.STONE_POLEARM, UItems.WOODEN_POLEARM, UItems.IRON_POLEARM + }) { + ItemModels.registerPolearm(itemModelGenerator, item); + } + + // sheets + ItemModels.register(itemModelGenerator, BedsheetsItem.ITEMS.values().stream().toArray(Item[]::new)); + // badges + ItemModels.register(itemModelGenerator, Race.REGISTRY.stream() + .map(race -> race.getId().withPath(p -> p + "_badge")) + .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) + .toArray(Item[]::new)); + } + + private void registerLogSet(BlockStateModelGenerator modelGenerator, Block log, Block wood) { + modelGenerator.registerLog(log).log(log).wood(wood); + } + + public void registerParentedAxisRotatedCubeColumn(BlockStateModelGenerator modelGenerator, Block modelSource, Block child) { + Identifier vertical = ModelIds.getBlockModelId(modelSource); + Identifier horizontal = ModelIds.getBlockSubModelId(modelSource, "_horizontal"); + modelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createAxisRotatedBlockState(child, vertical, horizontal)); + modelGenerator.registerParentedItemModel(child, vertical); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java new file mode 100644 index 00000000..c40b7f1f --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java @@ -0,0 +1,19 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.function.Consumer; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.data.server.recipe.RecipeJsonProvider; + +public class URecipeProvider extends FabricRecipeProvider { + public URecipeProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void generate(Consumer exporter) { + + + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/item/BedsheetsItem.java b/src/main/java/com/minelittlepony/unicopia/item/BedsheetsItem.java index ddd94336..32ecc6c4 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/BedsheetsItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/BedsheetsItem.java @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BedsheetsItem extends Item { - private static final Map ITEMS = new HashMap<>(); + public static final Map ITEMS = new HashMap<>(); private final CloudBedBlock.SheetPattern pattern; diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 5ee6baeb..8d30b634 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -177,7 +177,7 @@ public interface UItems { Item GREEN_BED_SHEETS = register(CloudBedBlock.SheetPattern.GREEN); Item CYAN_BED_SHEETS = register(CloudBedBlock.SheetPattern.CYAN); Item LIGHT_BLUE_BED_SHEETS = register(CloudBedBlock.SheetPattern.LIGHT_BLUE); - Item BLUE_SHEETS = register(CloudBedBlock.SheetPattern.BLUE); + Item BLUE_BED_SHEETS = register(CloudBedBlock.SheetPattern.BLUE); Item PURPLE_BED_SHEETS = register(CloudBedBlock.SheetPattern.PURPLE); Item MAGENTA_BED_SHEETS = register(CloudBedBlock.SheetPattern.MAGENTA); Item PINK_BED_SHEETS = register(CloudBedBlock.SheetPattern.PINK); diff --git a/src/main/resources/assets/unicopia/blockstates/palm_button.json b/src/main/resources/assets/unicopia/blockstates/palm_button.json deleted file mode 100644 index 45d701d8..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_button.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "variants": { - "face=ceiling,facing=east,powered=false": { - "model": "unicopia:block/palm_button", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=east,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "x": 180, - "y": 270 - }, - "face=ceiling,facing=north,powered=false": { - "model": "unicopia:block/palm_button", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=north,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "x": 180, - "y": 180 - }, - "face=ceiling,facing=south,powered=false": { - "model": "unicopia:block/palm_button", - "x": 180 - }, - "face=ceiling,facing=south,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "x": 180 - }, - "face=ceiling,facing=west,powered=false": { - "model": "unicopia:block/palm_button", - "x": 180, - "y": 90 - }, - "face=ceiling,facing=west,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "x": 180, - "y": 90 - }, - "face=floor,facing=east,powered=false": { - "model": "unicopia:block/palm_button", - "y": 90 - }, - "face=floor,facing=east,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "y": 90 - }, - "face=floor,facing=north,powered=false": { - "model": "unicopia:block/palm_button" - }, - "face=floor,facing=north,powered=true": { - "model": "unicopia:block/palm_button_pressed" - }, - "face=floor,facing=south,powered=false": { - "model": "unicopia:block/palm_button", - "y": 180 - }, - "face=floor,facing=south,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "y": 180 - }, - "face=floor,facing=west,powered=false": { - "model": "unicopia:block/palm_button", - "y": 270 - }, - "face=floor,facing=west,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "y": 270 - }, - "face=wall,facing=east,powered=false": { - "model": "unicopia:block/palm_button", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=east,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "uvlock": true, - "x": 90, - "y": 90 - }, - "face=wall,facing=north,powered=false": { - "model": "unicopia:block/palm_button", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=north,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "uvlock": true, - "x": 90 - }, - "face=wall,facing=south,powered=false": { - "model": "unicopia:block/palm_button", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=south,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "uvlock": true, - "x": 90, - "y": 180 - }, - "face=wall,facing=west,powered=false": { - "model": "unicopia:block/palm_button", - "uvlock": true, - "x": 90, - "y": 270 - }, - "face=wall,facing=west,powered=true": { - "model": "unicopia:block/palm_button_pressed", - "uvlock": true, - "x": 90, - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_door.json b/src/main/resources/assets/unicopia/blockstates/palm_door.json deleted file mode 100644 index 8f0edd6d..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_door.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false": { - "model": "unicopia:block/palm_door_bottom_left" - }, - "facing=east,half=lower,hinge=left,open=true": { - "model": "unicopia:block/palm_door_bottom_left_open", - "y": 90 - }, - "facing=east,half=lower,hinge=right,open=false": { - "model": "unicopia:block/palm_door_bottom_right" - }, - "facing=east,half=lower,hinge=right,open=true": { - "model": "unicopia:block/palm_door_bottom_right_open", - "y": 270 - }, - "facing=east,half=upper,hinge=left,open=false": { - "model": "unicopia:block/palm_door_top_left" - }, - "facing=east,half=upper,hinge=left,open=true": { - "model": "unicopia:block/palm_door_top_left_open", - "y": 90 - }, - "facing=east,half=upper,hinge=right,open=false": { - "model": "unicopia:block/palm_door_top_right" - }, - "facing=east,half=upper,hinge=right,open=true": { - "model": "unicopia:block/palm_door_top_right_open", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=false": { - "model": "unicopia:block/palm_door_bottom_left", - "y": 270 - }, - "facing=north,half=lower,hinge=left,open=true": { - "model": "unicopia:block/palm_door_bottom_left_open" - }, - "facing=north,half=lower,hinge=right,open=false": { - "model": "unicopia:block/palm_door_bottom_right", - "y": 270 - }, - "facing=north,half=lower,hinge=right,open=true": { - "model": "unicopia:block/palm_door_bottom_right_open", - "y": 180 - }, - "facing=north,half=upper,hinge=left,open=false": { - "model": "unicopia:block/palm_door_top_left", - "y": 270 - }, - "facing=north,half=upper,hinge=left,open=true": { - "model": "unicopia:block/palm_door_top_left_open" - }, - "facing=north,half=upper,hinge=right,open=false": { - "model": "unicopia:block/palm_door_top_right", - "y": 270 - }, - "facing=north,half=upper,hinge=right,open=true": { - "model": "unicopia:block/palm_door_top_right_open", - "y": 180 - }, - "facing=south,half=lower,hinge=left,open=false": { - "model": "unicopia:block/palm_door_bottom_left", - "y": 90 - }, - "facing=south,half=lower,hinge=left,open=true": { - "model": "unicopia:block/palm_door_bottom_left_open", - "y": 180 - }, - "facing=south,half=lower,hinge=right,open=false": { - "model": "unicopia:block/palm_door_bottom_right", - "y": 90 - }, - "facing=south,half=lower,hinge=right,open=true": { - "model": "unicopia:block/palm_door_bottom_right_open" - }, - "facing=south,half=upper,hinge=left,open=false": { - "model": "unicopia:block/palm_door_top_left", - "y": 90 - }, - "facing=south,half=upper,hinge=left,open=true": { - "model": "unicopia:block/palm_door_top_left_open", - "y": 180 - }, - "facing=south,half=upper,hinge=right,open=false": { - "model": "unicopia:block/palm_door_top_right", - "y": 90 - }, - "facing=south,half=upper,hinge=right,open=true": { - "model": "unicopia:block/palm_door_top_right_open" - }, - "facing=west,half=lower,hinge=left,open=false": { - "model": "unicopia:block/palm_door_bottom_left", - "y": 180 - }, - "facing=west,half=lower,hinge=left,open=true": { - "model": "unicopia:block/palm_door_bottom_left_open", - "y": 270 - }, - "facing=west,half=lower,hinge=right,open=false": { - "model": "unicopia:block/palm_door_bottom_right", - "y": 180 - }, - "facing=west,half=lower,hinge=right,open=true": { - "model": "unicopia:block/palm_door_bottom_right_open", - "y": 90 - }, - "facing=west,half=upper,hinge=left,open=false": { - "model": "unicopia:block/palm_door_top_left", - "y": 180 - }, - "facing=west,half=upper,hinge=left,open=true": { - "model": "unicopia:block/palm_door_top_left_open", - "y": 270 - }, - "facing=west,half=upper,hinge=right,open=false": { - "model": "unicopia:block/palm_door_top_right", - "y": 180 - }, - "facing=west,half=upper,hinge=right,open=true": { - "model": "unicopia:block/palm_door_top_right_open", - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_fence.json b/src/main/resources/assets/unicopia/blockstates/palm_fence.json deleted file mode 100644 index 922c733a..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "unicopia:block/palm_fence_post" - } - }, - { - "apply": { - "model": "unicopia:block/palm_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "unicopia:block/palm_fence_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "unicopia:block/palm_fence_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "unicopia:block/palm_fence_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_fence_gate.json b/src/main/resources/assets/unicopia/blockstates/palm_fence_gate.json deleted file mode 100644 index 44a911b9..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "unicopia:block/palm_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "unicopia:block/palm_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "unicopia:block/palm_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "unicopia:block/palm_fence_gate_wall_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "unicopia:block/palm_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "unicopia:block/palm_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "unicopia:block/palm_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "unicopia:block/palm_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "unicopia:block/palm_fence_gate", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "unicopia:block/palm_fence_gate_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "unicopia:block/palm_fence_gate_wall", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "unicopia:block/palm_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "unicopia:block/palm_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "unicopia:block/palm_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "unicopia:block/palm_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "unicopia:block/palm_fence_gate_wall_open", - "uvlock": true, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_hanging_sign.json b/src/main/resources/assets/unicopia/blockstates/palm_hanging_sign.json deleted file mode 100644 index c49365e4..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_hanging_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_hanging_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_leaves.json b/src/main/resources/assets/unicopia/blockstates/palm_leaves.json deleted file mode 100644 index cbba202c..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_leaves" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/palm_log.json b/src/main/resources/assets/unicopia/blockstates/palm_log.json deleted file mode 100644 index 4b9b3f6f..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/palm_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/palm_log" - }, - "axis=z": { - "model": "unicopia:block/palm_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/palm_planks.json b/src/main/resources/assets/unicopia/blockstates/palm_planks.json deleted file mode 100644 index c01341f2..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_planks" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/palm_pressure_plate.json b/src/main/resources/assets/unicopia/blockstates/palm_pressure_plate.json deleted file mode 100644 index 240df462..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_pressure_plate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "powered=false": { - "model": "unicopia:block/palm_pressure_plate" - }, - "powered=true": { - "model": "unicopia:block/palm_pressure_plate_down" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_sapling.json b/src/main/resources/assets/unicopia/blockstates/palm_sapling.json deleted file mode 100644 index 12d87308..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_sapling" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/palm_sign.json b/src/main/resources/assets/unicopia/blockstates/palm_sign.json deleted file mode 100644 index 9805da33..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_slab.json b/src/main/resources/assets/unicopia/blockstates/palm_slab.json deleted file mode 100644 index 37b307fd..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "unicopia:block/palm_slab" - }, - "type=double": { - "model": "unicopia:block/palm_planks" - }, - "type=top": { - "model": "unicopia:block/palm_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_stairs.json b/src/main/resources/assets/unicopia/blockstates/palm_stairs.json deleted file mode 100644 index c79fbe9b..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/palm_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/palm_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/palm_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/palm_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_trapdoor.json b/src/main/resources/assets/unicopia/blockstates/palm_trapdoor.json deleted file mode 100644 index 5753984b..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_trapdoor.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,open=false": { - "model": "unicopia:block/palm_trapdoor_bottom" - }, - "facing=east,half=bottom,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 90 - }, - "facing=east,half=top,open=false": { - "model": "unicopia:block/palm_trapdoor_top" - }, - "facing=east,half=top,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 90 - }, - "facing=north,half=bottom,open=false": { - "model": "unicopia:block/palm_trapdoor_bottom" - }, - "facing=north,half=bottom,open=true": { - "model": "unicopia:block/palm_trapdoor_open" - }, - "facing=north,half=top,open=false": { - "model": "unicopia:block/palm_trapdoor_top" - }, - "facing=north,half=top,open=true": { - "model": "unicopia:block/palm_trapdoor_open" - }, - "facing=south,half=bottom,open=false": { - "model": "unicopia:block/palm_trapdoor_bottom" - }, - "facing=south,half=bottom,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 180 - }, - "facing=south,half=top,open=false": { - "model": "unicopia:block/palm_trapdoor_top" - }, - "facing=south,half=top,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 180 - }, - "facing=west,half=bottom,open=false": { - "model": "unicopia:block/palm_trapdoor_bottom" - }, - "facing=west,half=bottom,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 270 - }, - "facing=west,half=top,open=false": { - "model": "unicopia:block/palm_trapdoor_top" - }, - "facing=west,half=top,open=true": { - "model": "unicopia:block/palm_trapdoor_open", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_wall_hanging_sign.json b/src/main/resources/assets/unicopia/blockstates/palm_wall_hanging_sign.json deleted file mode 100644 index c49365e4..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_wall_hanging_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_hanging_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_wall_sign.json b/src/main/resources/assets/unicopia/blockstates/palm_wall_sign.json deleted file mode 100644 index 9805da33..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_wall_sign.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_sign" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/palm_wood.json b/src/main/resources/assets/unicopia/blockstates/palm_wood.json deleted file mode 100644 index 65294bd0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/palm_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/palm_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/potted_palm_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_palm_sapling.json deleted file mode 100644 index b73dcef1..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_palm_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_palm_sapling" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/potted_zapling.json b/src/main/resources/assets/unicopia/blockstates/potted_zapling.json deleted file mode 100644 index 8e6fa653..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_zapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_zapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/stripped_palm_log.json b/src/main/resources/assets/unicopia/blockstates/stripped_palm_log.json deleted file mode 100644 index 43cf368e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/stripped_palm_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/stripped_palm_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/stripped_palm_log" - }, - "axis=z": { - "model": "unicopia:block/stripped_palm_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/stripped_palm_wood.json b/src/main/resources/assets/unicopia/blockstates/stripped_palm_wood.json deleted file mode 100644 index 9c1bee35..00000000 --- a/src/main/resources/assets/unicopia/blockstates/stripped_palm_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/stripped_palm_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/stripped_zap_log.json b/src/main/resources/assets/unicopia/blockstates/stripped_zap_log.json deleted file mode 100644 index 06956a0e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/stripped_zap_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/stripped_zap_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/stripped_zap_log" - }, - "axis=z": { - "model": "unicopia:block/stripped_zap_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/stripped_zap_wood.json b/src/main/resources/assets/unicopia/blockstates/stripped_zap_wood.json deleted file mode 100644 index c99ab1cc..00000000 --- a/src/main/resources/assets/unicopia/blockstates/stripped_zap_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/stripped_zap_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json deleted file mode 100644 index 06956a0e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/stripped_zap_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/stripped_zap_log" - }, - "axis=z": { - "model": "unicopia:block/stripped_zap_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json b/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json deleted file mode 100644 index c99ab1cc..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_stripped_zap_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/stripped_zap_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence.json deleted file mode 100644 index 0bd4ba9a..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "unicopia:block/zap_fence_post" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence_gate.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence_gate.json deleted file mode 100644 index 05fd9c83..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json deleted file mode 100644 index c3b64c19..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/zap_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/zap_log" - }, - "axis=z": { - "model": "unicopia:block/zap_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json deleted file mode 100644 index ac083bd3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_planks" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json deleted file mode 100644 index 4de01681..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "unicopia:block/zap_slab" - }, - "type=double": { - "model": "unicopia:block/zap_planks" - }, - "type=top": { - "model": "unicopia:block/zap_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json deleted file mode 100644 index 2fdbab92..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json b/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json deleted file mode 100644 index 30090bc9..00000000 --- a/src/main/resources/assets/unicopia/blockstates/waxed_zap_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/zap_fence.json b/src/main/resources/assets/unicopia/blockstates/zap_fence.json deleted file mode 100644 index 0bd4ba9a..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_fence.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "unicopia:block/zap_fence_post" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true - }, - "when": { - "north": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "true" - } - }, - { - "apply": { - "model": "unicopia:block/zap_fence_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "true" - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_fence_gate.json b/src/main/resources/assets/unicopia/blockstates/zap_fence_gate.json deleted file mode 100644 index 05fd9c83..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_fence_gate.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "variants": { - "facing=east,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 270 - }, - "facing=east,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 270 - }, - "facing=north,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 180 - }, - "facing=north,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 180 - }, - "facing=south,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true - }, - "facing=south,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true - }, - "facing=south,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true - }, - "facing=south,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true - }, - "facing=west,in_wall=false,open=false": { - "model": "unicopia:block/zap_fence_gate", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=false,open=true": { - "model": "unicopia:block/zap_fence_gate_open", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=false": { - "model": "unicopia:block/zap_fence_gate_wall", - "uvlock": true, - "y": 90 - }, - "facing=west,in_wall=true,open=true": { - "model": "unicopia:block/zap_fence_gate_wall_open", - "uvlock": true, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_log.json b/src/main/resources/assets/unicopia/blockstates/zap_log.json deleted file mode 100644 index c3b64c19..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/zap_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/zap_log" - }, - "axis=z": { - "model": "unicopia:block/zap_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/zap_planks.json b/src/main/resources/assets/unicopia/blockstates/zap_planks.json deleted file mode 100644 index ac083bd3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_planks" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/zap_slab.json b/src/main/resources/assets/unicopia/blockstates/zap_slab.json deleted file mode 100644 index 4de01681..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "unicopia:block/zap_slab" - }, - "type=double": { - "model": "unicopia:block/zap_planks" - }, - "type=top": { - "model": "unicopia:block/zap_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_stairs.json b/src/main/resources/assets/unicopia/blockstates/zap_stairs.json deleted file mode 100644 index 2fdbab92..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/zap_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/zap_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/zap_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_wood.json b/src/main/resources/assets/unicopia/blockstates/zap_wood.json deleted file mode 100644 index 30090bc9..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_wood.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_wood" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/zapling.json b/src/main/resources/assets/unicopia/blockstates/zapling.json deleted file mode 100644 index 02ed0968..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_button.json b/src/main/resources/assets/unicopia/models/block/palm_button.json deleted file mode 100644 index d9a4064e..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_button.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_button_inventory.json b/src/main/resources/assets/unicopia/models/block/palm_button_inventory.json deleted file mode 100644 index d6481cbf..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_button_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_inventory", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_button_pressed.json b/src/main/resources/assets/unicopia/models/block/palm_button_pressed.json deleted file mode 100644 index 1f74c14e..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_button_pressed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/button_pressed", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left.json b/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left.json deleted file mode 100644 index 8719bc87..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left_open.json b/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left_open.json deleted file mode 100644 index e6ec3a9a..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right.json b/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right.json deleted file mode 100644 index c7756ab7..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right_open.json b/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right_open.json deleted file mode 100644 index c8ca22b8..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_top_left.json b/src/main/resources/assets/unicopia/models/block/palm_door_top_left.json deleted file mode 100644 index ad96f313..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_top_left_open.json b/src/main/resources/assets/unicopia/models/block/palm_door_top_left_open.json deleted file mode 100644 index cc5854f9..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_top_right.json b/src/main/resources/assets/unicopia/models/block/palm_door_top_right.json deleted file mode 100644 index e77082de..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_door_top_right_open.json b/src/main/resources/assets/unicopia/models/block/palm_door_top_right_open.json deleted file mode 100644 index 44dee227..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "unicopia:block/palm_door_bottom", - "top": "unicopia:block/palm_door_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_gate.json b/src/main/resources/assets/unicopia/models/block/palm_fence_gate.json deleted file mode 100644 index 263f85c0..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_open.json b/src/main/resources/assets/unicopia/models/block/palm_fence_gate_open.json deleted file mode 100644 index 179ba957..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall.json b/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall.json deleted file mode 100644 index c8c0b4a3..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall_open.json b/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall_open.json deleted file mode 100644 index 5e2fa61c..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_inventory.json b/src/main/resources/assets/unicopia/models/block/palm_fence_inventory.json deleted file mode 100644 index 8c0d56e7..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_post.json b/src/main/resources/assets/unicopia/models/block/palm_fence_post.json deleted file mode 100644 index 36d7618a..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_fence_side.json b/src/main/resources/assets/unicopia/models/block/palm_fence_side.json deleted file mode 100644 index d5f57dd2..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_fence_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_hanging_sign.json b/src/main/resources/assets/unicopia/models/block/palm_hanging_sign.json deleted file mode 100644 index 0186191b..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_hanging_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "unicopia:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_leaves.json b/src/main/resources/assets/unicopia/models/block/palm_leaves.json deleted file mode 100644 index 0e2acec2..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/palm_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_log.json b/src/main/resources/assets/unicopia/models/block/palm_log.json deleted file mode 100644 index 009b7de2..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "unicopia:block/palm_log_top", - "side": "unicopia:block/palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_log_horizontal.json b/src/main/resources/assets/unicopia/models/block/palm_log_horizontal.json deleted file mode 100644 index 63718a37..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "unicopia:block/palm_log_top", - "side": "unicopia:block/palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_planks.json b/src/main/resources/assets/unicopia/models/block/palm_planks.json deleted file mode 100644 index 07e952a7..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_pressure_plate.json b/src/main/resources/assets/unicopia/models/block/palm_pressure_plate.json deleted file mode 100644 index 42f57739..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_pressure_plate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_up", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_pressure_plate_down.json b/src/main/resources/assets/unicopia/models/block/palm_pressure_plate_down.json deleted file mode 100644 index c99de0c1..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_pressure_plate_down.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/pressure_plate_down", - "textures": { - "texture": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_sapling.json b/src/main/resources/assets/unicopia/models/block/palm_sapling.json deleted file mode 100644 index d9718e2e..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/palm_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_sign.json b/src/main/resources/assets/unicopia/models/block/palm_sign.json deleted file mode 100644 index 3cd27604..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_sign.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_slab.json b/src/main/resources/assets/unicopia/models/block/palm_slab.json deleted file mode 100644 index a878d492..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/palm_planks", - "side": "unicopia:block/palm_planks", - "top": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_slab_top.json b/src/main/resources/assets/unicopia/models/block/palm_slab_top.json deleted file mode 100644 index 860ddaf6..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/palm_planks", - "side": "unicopia:block/palm_planks", - "top": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_stairs.json b/src/main/resources/assets/unicopia/models/block/palm_stairs.json deleted file mode 100644 index c7b449fb..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "unicopia:block/palm_planks", - "side": "unicopia:block/palm_planks", - "top": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/palm_stairs_inner.json deleted file mode 100644 index 2afbe717..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "unicopia:block/palm_planks", - "side": "unicopia:block/palm_planks", - "top": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/palm_stairs_outer.json deleted file mode 100644 index ab64e431..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "unicopia:block/palm_planks", - "side": "unicopia:block/palm_planks", - "top": "unicopia:block/palm_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_bottom.json b/src/main/resources/assets/unicopia/models/block/palm_trapdoor_bottom.json deleted file mode 100644 index d24be742..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_trapdoor_bottom", - "textures": { - "texture": "unicopia:block/palm_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_open.json b/src/main/resources/assets/unicopia/models/block/palm_trapdoor_open.json deleted file mode 100644 index 2b33f3c9..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_trapdoor_open", - "textures": { - "texture": "unicopia:block/palm_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_top.json b/src/main/resources/assets/unicopia/models/block/palm_trapdoor_top.json deleted file mode 100644 index 58ef2dc7..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_trapdoor_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_trapdoor_top", - "textures": { - "texture": "unicopia:block/palm_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/palm_wood.json b/src/main/resources/assets/unicopia/models/block/palm_wood.json deleted file mode 100644 index 67ea6997..00000000 --- a/src/main/resources/assets/unicopia/models/block/palm_wood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/potted_palm_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_palm_sapling.json deleted file mode 100644 index 37ca7b25..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_palm_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/palm_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/potted_zapling.json b/src/main/resources/assets/unicopia/models/block/potted_zapling.json deleted file mode 100644 index 24cd445e..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_zapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/zapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/stripped_palm_log.json b/src/main/resources/assets/unicopia/models/block/stripped_palm_log.json deleted file mode 100644 index ba3c1d65..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_palm_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "unicopia:block/stripped_palm_log_top", - "side": "unicopia:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stripped_palm_log_horizontal.json b/src/main/resources/assets/unicopia/models/block/stripped_palm_log_horizontal.json deleted file mode 100644 index 68fa26c0..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_palm_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "unicopia:block/stripped_palm_log_top", - "side": "unicopia:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stripped_palm_wood.json b/src/main/resources/assets/unicopia/models/block/stripped_palm_wood.json deleted file mode 100644 index 4436d592..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_palm_wood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/stripped_palm_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stripped_zap_log.json b/src/main/resources/assets/unicopia/models/block/stripped_zap_log.json deleted file mode 100644 index 8aee8c31..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_zap_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "unicopia:block/stripped_zap_log_top", - "side": "unicopia:block/stripped_zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stripped_zap_log_horizontal.json b/src/main/resources/assets/unicopia/models/block/stripped_zap_log_horizontal.json deleted file mode 100644 index 533ace01..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_zap_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "unicopia:block/stripped_zap_log_top", - "side": "unicopia:block/stripped_zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stripped_zap_wood.json b/src/main/resources/assets/unicopia/models/block/stripped_zap_wood.json deleted file mode 100644 index c0b91a20..00000000 --- a/src/main/resources/assets/unicopia/models/block/stripped_zap_wood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/stripped_zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_gate.json b/src/main/resources/assets/unicopia/models/block/zap_fence_gate.json deleted file mode 100644 index 0a8e8157..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_gate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_open.json b/src/main/resources/assets/unicopia/models/block/zap_fence_gate_open.json deleted file mode 100644 index b528c103..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_open", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall.json b/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall.json deleted file mode 100644 index 7a4b18ff..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall_open.json b/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall_open.json deleted file mode 100644 index 594f73d1..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_gate_wall_open.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_fence_gate_wall_open", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_inventory.json b/src/main/resources/assets/unicopia/models/block/zap_fence_inventory.json deleted file mode 100644 index 4972bdf0..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_inventory", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_post.json b/src/main/resources/assets/unicopia/models/block/zap_fence_post.json deleted file mode 100644 index 19a87f0a..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_post", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_fence_side.json b/src/main/resources/assets/unicopia/models/block/zap_fence_side.json deleted file mode 100644 index b6d72a37..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_fence_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/fence_side", - "textures": { - "texture": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_log.json b/src/main/resources/assets/unicopia/models/block/zap_log.json deleted file mode 100644 index e787c248..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "unicopia:block/zap_log_top", - "side": "unicopia:block/zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_log_horizontal.json b/src/main/resources/assets/unicopia/models/block/zap_log_horizontal.json deleted file mode 100644 index 67f2f50c..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "unicopia:block/zap_log_top", - "side": "unicopia:block/zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_planks.json b/src/main/resources/assets/unicopia/models/block/zap_planks.json deleted file mode 100644 index a3b0506c..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_slab.json b/src/main/resources/assets/unicopia/models/block/zap_slab.json deleted file mode 100644 index 019be187..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/zap_planks", - "side": "unicopia:block/zap_planks", - "top": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_slab_top.json b/src/main/resources/assets/unicopia/models/block/zap_slab_top.json deleted file mode 100644 index c842f9e8..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/zap_planks", - "side": "unicopia:block/zap_planks", - "top": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs.json b/src/main/resources/assets/unicopia/models/block/zap_stairs.json deleted file mode 100644 index 56f63e69..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "unicopia:block/zap_planks", - "side": "unicopia:block/zap_planks", - "top": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json deleted file mode 100644 index 7653e732..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "unicopia:block/zap_planks", - "side": "unicopia:block/zap_planks", - "top": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json deleted file mode 100644 index 57424f35..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "unicopia:block/zap_planks", - "side": "unicopia:block/zap_planks", - "top": "unicopia:block/zap_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_wood.json b/src/main/resources/assets/unicopia/models/block/zap_wood.json deleted file mode 100644 index 5f3e076a..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_wood.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/zap_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zapling.json b/src/main/resources/assets/unicopia/models/block/zapling.json deleted file mode 100644 index e630495b..00000000 --- a/src/main/resources/assets/unicopia/models/block/zapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/zapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/acacia_basket.json b/src/main/resources/assets/unicopia/models/item/acacia_basket.json deleted file mode 100644 index b2d23162..00000000 --- a/src/main/resources/assets/unicopia/models/item/acacia_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/acacia_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/acorn.json b/src/main/resources/assets/unicopia/models/item/acorn.json deleted file mode 100644 index aba8ec9a..00000000 --- a/src/main/resources/assets/unicopia/models/item/acorn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/acorn" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json b/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json deleted file mode 100644 index 00ae6f0b..00000000 --- a/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/amulet", - "textures": { - "layer0": "unicopia:item/alicorn_amulet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/alicorn_badge.json b/src/main/resources/assets/unicopia/models/item/alicorn_badge.json deleted file mode 100644 index 53b3c08f..00000000 --- a/src/main/resources/assets/unicopia/models/item/alicorn_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/alicorn_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/apple_bed_sheets.json deleted file mode 100644 index bc1ac46a..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/apple_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_pie.json b/src/main/resources/assets/unicopia/models/item/apple_pie.json deleted file mode 100644 index ddbe809f..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple_pie.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/apple_pie" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json b/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json deleted file mode 100644 index ec8b8f2d..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple_pie_hoof.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/apple_pie_hoof" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_pie_slice.json b/src/main/resources/assets/unicopia/models/item/apple_pie_slice.json deleted file mode 100644 index b2cfc3bb..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple_pie_slice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/apple_pie_slice" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/bamboo_basket.json b/src/main/resources/assets/unicopia/models/item/bamboo_basket.json deleted file mode 100644 index d18bc6e1..00000000 --- a/src/main/resources/assets/unicopia/models/item/bamboo_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/bamboo_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/banana.json b/src/main/resources/assets/unicopia/models/item/banana.json deleted file mode 100644 index ebc8e4a0..00000000 --- a/src/main/resources/assets/unicopia/models/item/banana.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/banana" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/barred_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/barred_bed_sheets.json deleted file mode 100644 index 259f1242..00000000 --- a/src/main/resources/assets/unicopia/models/item/barred_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/barred_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/bat_badge.json b/src/main/resources/assets/unicopia/models/item/bat_badge.json deleted file mode 100644 index a53d94a5..00000000 --- a/src/main/resources/assets/unicopia/models/item/bat_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/bat_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/birch_basket.json b/src/main/resources/assets/unicopia/models/item/birch_basket.json deleted file mode 100644 index 57ce4834..00000000 --- a/src/main/resources/assets/unicopia/models/item/birch_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/birch_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json deleted file mode 100644 index bc7f7ba1..00000000 --- a/src/main/resources/assets/unicopia/models/item/black_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/black_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/blue_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/blue_bed_sheets.json deleted file mode 100644 index bebc30f4..00000000 --- a/src/main/resources/assets/unicopia/models/item/blue_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/blue_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/botched_gem.json b/src/main/resources/assets/unicopia/models/item/botched_gem.json deleted file mode 100644 index 7c470b43..00000000 --- a/src/main/resources/assets/unicopia/models/item/botched_gem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/botched_gem" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/broken_alicorn_amulet.json b/src/main/resources/assets/unicopia/models/item/broken_alicorn_amulet.json deleted file mode 100644 index b9bf5700..00000000 --- a/src/main/resources/assets/unicopia/models/item/broken_alicorn_amulet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/broken_alicorn_amulet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/broken_sunglasses.json b/src/main/resources/assets/unicopia/models/item/broken_sunglasses.json deleted file mode 100644 index 66917a41..00000000 --- a/src/main/resources/assets/unicopia/models/item/broken_sunglasses.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/broken_sunglasses" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json deleted file mode 100644 index e731713b..00000000 --- a/src/main/resources/assets/unicopia/models/item/brown_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/brown_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/burned_juice.json b/src/main/resources/assets/unicopia/models/item/burned_juice.json deleted file mode 100644 index a12a89b8..00000000 --- a/src/main/resources/assets/unicopia/models/item/burned_juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/burned_juice" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/burned_toast.json b/src/main/resources/assets/unicopia/models/item/burned_toast.json deleted file mode 100644 index 59b709e0..00000000 --- a/src/main/resources/assets/unicopia/models/item/burned_toast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/burned_toast" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json b/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json deleted file mode 100644 index d1aaa9d6..00000000 --- a/src/main/resources/assets/unicopia/models/item/butterfly_spawn_egg.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "minecraft:item/template_spawn_egg" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/carapace.json b/src/main/resources/assets/unicopia/models/item/carapace.json deleted file mode 100644 index 80305a4a..00000000 --- a/src/main/resources/assets/unicopia/models/item/carapace.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/carapace" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/changeling_badge.json b/src/main/resources/assets/unicopia/models/item/changeling_badge.json deleted file mode 100644 index bf9829ed..00000000 --- a/src/main/resources/assets/unicopia/models/item/changeling_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/changeling_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/checkered_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/checkered_bed_sheets.json deleted file mode 100644 index caa3851c..00000000 --- a/src/main/resources/assets/unicopia/models/item/checkered_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/checkered_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cherry_basket.json b/src/main/resources/assets/unicopia/models/item/cherry_basket.json deleted file mode 100644 index e7c178ef..00000000 --- a/src/main/resources/assets/unicopia/models/item/cherry_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/cherry_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cider.json b/src/main/resources/assets/unicopia/models/item/cider.json deleted file mode 100644 index 59978ebf..00000000 --- a/src/main/resources/assets/unicopia/models/item/cider.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/cider" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/clam_shell.json b/src/main/resources/assets/unicopia/models/item/clam_shell.json deleted file mode 100644 index cde6769f..00000000 --- a/src/main/resources/assets/unicopia/models/item/clam_shell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/clam_shell" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cloth_bed.json b/src/main/resources/assets/unicopia/models/item/cloth_bed.json index 5d06b91c..cf15d523 100644 --- a/src/main/resources/assets/unicopia/models/item/cloth_bed.json +++ b/src/main/resources/assets/unicopia/models/item/cloth_bed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/template_bed", "textures": { - "particle": "minecraft:item/white_wool" + "particle": "minecraft:block/white_wool" } } diff --git a/src/main/resources/assets/unicopia/models/item/cloud_bed.json b/src/main/resources/assets/unicopia/models/item/cloud_bed.json index 5d06b91c..70faf964 100644 --- a/src/main/resources/assets/unicopia/models/item/cloud_bed.json +++ b/src/main/resources/assets/unicopia/models/item/cloud_bed.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/template_bed", "textures": { - "particle": "minecraft:item/white_wool" + "particle": "unicopia:block/cloud" } } diff --git a/src/main/resources/assets/unicopia/models/item/cloud_chest.json b/src/main/resources/assets/unicopia/models/item/cloud_chest.json index 74aedb05..0ff9d87b 100644 --- a/src/main/resources/assets/unicopia/models/item/cloud_chest.json +++ b/src/main/resources/assets/unicopia/models/item/cloud_chest.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/chest", "textures": { - "particle": "minecraft:item/white_wool" + "particle": "unicopia:block/cloud" } } diff --git a/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json b/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json deleted file mode 100644 index e2c131f9..00000000 --- a/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/cooked_zap_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/copper_horse_shoe.json b/src/main/resources/assets/unicopia/models/item/copper_horse_shoe.json deleted file mode 100644 index a395cc95..00000000 --- a/src/main/resources/assets/unicopia/models/item/copper_horse_shoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/copper_horse_shoe" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/crispy_hay_fries.json b/src/main/resources/assets/unicopia/models/item/crispy_hay_fries.json deleted file mode 100644 index 44578afe..00000000 --- a/src/main/resources/assets/unicopia/models/item/crispy_hay_fries.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/crispy_hay_fries" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/crystal_heart.json b/src/main/resources/assets/unicopia/models/item/crystal_heart.json deleted file mode 100644 index a1c5d185..00000000 --- a/src/main/resources/assets/unicopia/models/item/crystal_heart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/crystal_heart" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/crystal_shard.json b/src/main/resources/assets/unicopia/models/item/crystal_shard.json deleted file mode 100644 index df4cbc3d..00000000 --- a/src/main/resources/assets/unicopia/models/item/crystal_shard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/crystal_shard" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/curing_joke.json b/src/main/resources/assets/unicopia/models/item/curing_joke.json deleted file mode 100644 index 65c5811a..00000000 --- a/src/main/resources/assets/unicopia/models/item/curing_joke.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/curing_joke" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json deleted file mode 100644 index 21cbb8fd..00000000 --- a/src/main/resources/assets/unicopia/models/item/cyan_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/cyan_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json b/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json deleted file mode 100644 index 68ee4c6a..00000000 --- a/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/daffodil_daisy_sandwich" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/dark_oak_basket.json b/src/main/resources/assets/unicopia/models/item/dark_oak_basket.json deleted file mode 100644 index 01d6ef2e..00000000 --- a/src/main/resources/assets/unicopia/models/item/dark_oak_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/dark_oak_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/diamond_polearm.json b/src/main/resources/assets/unicopia/models/item/diamond_polearm.json deleted file mode 100644 index d4fa68f0..00000000 --- a/src/main/resources/assets/unicopia/models/item/diamond_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/diamond_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/diamond_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/diamond_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/diamond_polearm_in_inventory.json deleted file mode 100644 index d2bb0d76..00000000 --- a/src/main/resources/assets/unicopia/models/item/diamond_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/diamond_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/diamond_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/diamond_polearm_throwing.json deleted file mode 100644 index c23fa56c..00000000 --- a/src/main/resources/assets/unicopia/models/item/diamond_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/diamond_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/dragon_breath_scroll.json b/src/main/resources/assets/unicopia/models/item/dragon_breath_scroll.json deleted file mode 100644 index b834492d..00000000 --- a/src/main/resources/assets/unicopia/models/item/dragon_breath_scroll.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/dragon_breath_scroll" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/earth_badge.json b/src/main/resources/assets/unicopia/models/item/earth_badge.json deleted file mode 100644 index 5a6fec00..00000000 --- a/src/main/resources/assets/unicopia/models/item/earth_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/earth_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/empty_jar.json b/src/main/resources/assets/unicopia/models/item/empty_jar.json deleted file mode 100644 index 7df21561..00000000 --- a/src/main/resources/assets/unicopia/models/item/empty_jar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/empty_jar" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/friendship_bracelet.json b/src/main/resources/assets/unicopia/models/item/friendship_bracelet.json deleted file mode 100644 index 06fa4fad..00000000 --- a/src/main/resources/assets/unicopia/models/item/friendship_bracelet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/friendship_bracelet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/giant_balloon.json b/src/main/resources/assets/unicopia/models/item/giant_balloon.json deleted file mode 100644 index 4df680ac..00000000 --- a/src/main/resources/assets/unicopia/models/item/giant_balloon.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/giant_balloon" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_feather.json b/src/main/resources/assets/unicopia/models/item/golden_feather.json deleted file mode 100644 index 4f6dd920..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_feather.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_feather" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_horse_shoe.json b/src/main/resources/assets/unicopia/models/item/golden_horse_shoe.json deleted file mode 100644 index 0b035f8a..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_horse_shoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_horse_shoe" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_oak_seeds.json b/src/main/resources/assets/unicopia/models/item/golden_oak_seeds.json deleted file mode 100644 index 16cb1fc6..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_oak_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_oak_seeds" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_polearm.json b/src/main/resources/assets/unicopia/models/item/golden_polearm.json deleted file mode 100644 index d5876f57..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/golden_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/golden_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/golden_polearm_in_inventory.json deleted file mode 100644 index a368786e..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/golden_polearm_throwing.json deleted file mode 100644 index d36f86fe..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/golden_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_wing.json b/src/main/resources/assets/unicopia/models/item/golden_wing.json deleted file mode 100644 index c44f184f..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_wing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_wing" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json deleted file mode 100644 index d14789b7..00000000 --- a/src/main/resources/assets/unicopia/models/item/gray_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/gray_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/green_apple.json b/src/main/resources/assets/unicopia/models/item/green_apple.json deleted file mode 100644 index c0ce5d05..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/green_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/green_apple_seeds.json b/src/main/resources/assets/unicopia/models/item/green_apple_seeds.json deleted file mode 100644 index 8c88f5e8..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_apple_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/green_apple_seeds" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json deleted file mode 100644 index 6675e779..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/green_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/grogars_bell.json b/src/main/resources/assets/unicopia/models/item/grogars_bell.json deleted file mode 100644 index 3b933219..00000000 --- a/src/main/resources/assets/unicopia/models/item/grogars_bell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/grogars_bell" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/gryphon_feather.json b/src/main/resources/assets/unicopia/models/item/gryphon_feather.json deleted file mode 100644 index af5d1671..00000000 --- a/src/main/resources/assets/unicopia/models/item/gryphon_feather.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/gryphon_feather" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/hay_burger.json b/src/main/resources/assets/unicopia/models/item/hay_burger.json deleted file mode 100644 index 21dd88c2..00000000 --- a/src/main/resources/assets/unicopia/models/item/hay_burger.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/hay_burger" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/hay_fries.json b/src/main/resources/assets/unicopia/models/item/hay_fries.json deleted file mode 100644 index 7634cbb5..00000000 --- a/src/main/resources/assets/unicopia/models/item/hay_fries.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/hay_fries" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/hippogriff_badge.json b/src/main/resources/assets/unicopia/models/item/hippogriff_badge.json deleted file mode 100644 index c37d99ce..00000000 --- a/src/main/resources/assets/unicopia/models/item/hippogriff_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/hippogriff_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/horse_shoe_fries.json b/src/main/resources/assets/unicopia/models/item/horse_shoe_fries.json deleted file mode 100644 index 2dcb13b0..00000000 --- a/src/main/resources/assets/unicopia/models/item/horse_shoe_fries.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/horse_shoe_fries" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/imported_oats.json b/src/main/resources/assets/unicopia/models/item/imported_oats.json deleted file mode 100644 index 554311e8..00000000 --- a/src/main/resources/assets/unicopia/models/item/imported_oats.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/imported_oats" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/iron_horse_shoe.json b/src/main/resources/assets/unicopia/models/item/iron_horse_shoe.json deleted file mode 100644 index 1d8fc483..00000000 --- a/src/main/resources/assets/unicopia/models/item/iron_horse_shoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/iron_horse_shoe" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/iron_polearm.json b/src/main/resources/assets/unicopia/models/item/iron_polearm.json deleted file mode 100644 index 50ff1f53..00000000 --- a/src/main/resources/assets/unicopia/models/item/iron_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/iron_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/iron_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/iron_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/iron_polearm_in_inventory.json deleted file mode 100644 index e1619d5e..00000000 --- a/src/main/resources/assets/unicopia/models/item/iron_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/iron_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/iron_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/iron_polearm_throwing.json deleted file mode 100644 index 50d9c2e1..00000000 --- a/src/main/resources/assets/unicopia/models/item/iron_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/iron_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/jam_toast.json b/src/main/resources/assets/unicopia/models/item/jam_toast.json deleted file mode 100644 index 1aac625b..00000000 --- a/src/main/resources/assets/unicopia/models/item/jam_toast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/jam_toast" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/juice.json b/src/main/resources/assets/unicopia/models/item/juice.json deleted file mode 100644 index 616a1ef5..00000000 --- a/src/main/resources/assets/unicopia/models/item/juice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/juice" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/jungle_basket.json b/src/main/resources/assets/unicopia/models/item/jungle_basket.json deleted file mode 100644 index d7bbc875..00000000 --- a/src/main/resources/assets/unicopia/models/item/jungle_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/jungle_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json deleted file mode 100644 index 8234a2b0..00000000 --- a/src/main/resources/assets/unicopia/models/item/kelp_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/kelp_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/kirin_badge.json b/src/main/resources/assets/unicopia/models/item/kirin_badge.json deleted file mode 100644 index 72d0e719..00000000 --- a/src/main/resources/assets/unicopia/models/item/kirin_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/kirin_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json deleted file mode 100644 index 362dbebd..00000000 --- a/src/main/resources/assets/unicopia/models/item/light_blue_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/light_blue_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json deleted file mode 100644 index e5aa977e..00000000 --- a/src/main/resources/assets/unicopia/models/item/light_gray_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/light_gray_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/lightning_jar.json b/src/main/resources/assets/unicopia/models/item/lightning_jar.json deleted file mode 100644 index a9255315..00000000 --- a/src/main/resources/assets/unicopia/models/item/lightning_jar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/lightning_jar" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json deleted file mode 100644 index 0b5188f0..00000000 --- a/src/main/resources/assets/unicopia/models/item/lime_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/lime_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/loot_bug_spawn_egg.json b/src/main/resources/assets/unicopia/models/item/loot_bug_spawn_egg.json deleted file mode 100644 index d1aaa9d6..00000000 --- a/src/main/resources/assets/unicopia/models/item/loot_bug_spawn_egg.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "minecraft:item/template_spawn_egg" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/love_bottle.json b/src/main/resources/assets/unicopia/models/item/love_bottle.json deleted file mode 100644 index 49b88b10..00000000 --- a/src/main/resources/assets/unicopia/models/item/love_bottle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/love_bottle" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/love_bucket.json b/src/main/resources/assets/unicopia/models/item/love_bucket.json deleted file mode 100644 index 0d627507..00000000 --- a/src/main/resources/assets/unicopia/models/item/love_bucket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/love_bucket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/love_mug.json b/src/main/resources/assets/unicopia/models/item/love_mug.json deleted file mode 100644 index f4260ce3..00000000 --- a/src/main/resources/assets/unicopia/models/item/love_mug.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/love_mug" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json deleted file mode 100644 index 3af7061c..00000000 --- a/src/main/resources/assets/unicopia/models/item/magenta_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/magenta_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/mango.json b/src/main/resources/assets/unicopia/models/item/mango.json deleted file mode 100644 index eba4d587..00000000 --- a/src/main/resources/assets/unicopia/models/item/mango.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/mango" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/mangrove_basket.json b/src/main/resources/assets/unicopia/models/item/mangrove_basket.json deleted file mode 100644 index a0f15f37..00000000 --- a/src/main/resources/assets/unicopia/models/item/mangrove_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/mangrove_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/meadowbrooks_staff.json b/src/main/resources/assets/unicopia/models/item/meadowbrooks_staff.json deleted file mode 100644 index 1a3489bb..00000000 --- a/src/main/resources/assets/unicopia/models/item/meadowbrooks_staff.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/handheld_staff", - "textures": { - "layer0": "unicopia:item/meadowbrooks_staff" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/muffin.json b/src/main/resources/assets/unicopia/models/item/muffin.json deleted file mode 100644 index 19192a75..00000000 --- a/src/main/resources/assets/unicopia/models/item/muffin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/muffin" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json b/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json deleted file mode 100644 index b90c915a..00000000 --- a/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/music_disc_crusade" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_funk.json b/src/main/resources/assets/unicopia/models/item/music_disc_funk.json deleted file mode 100644 index 2e659fa5..00000000 --- a/src/main/resources/assets/unicopia/models/item/music_disc_funk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/music_disc_funk" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_pet.json b/src/main/resources/assets/unicopia/models/item/music_disc_pet.json deleted file mode 100644 index fd19ed13..00000000 --- a/src/main/resources/assets/unicopia/models/item/music_disc_pet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/music_disc_pet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_popular.json b/src/main/resources/assets/unicopia/models/item/music_disc_popular.json deleted file mode 100644 index aed62677..00000000 --- a/src/main/resources/assets/unicopia/models/item/music_disc_popular.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/music_disc_popular" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/netherite_horse_shoe.json b/src/main/resources/assets/unicopia/models/item/netherite_horse_shoe.json deleted file mode 100644 index 3138e8d6..00000000 --- a/src/main/resources/assets/unicopia/models/item/netherite_horse_shoe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/netherite_horse_shoe" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/netherite_polearm.json b/src/main/resources/assets/unicopia/models/item/netherite_polearm.json deleted file mode 100644 index e9021ea1..00000000 --- a/src/main/resources/assets/unicopia/models/item/netherite_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/netherite_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/netherite_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/netherite_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/netherite_polearm_in_inventory.json deleted file mode 100644 index 1abde3fe..00000000 --- a/src/main/resources/assets/unicopia/models/item/netherite_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/netherite_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/netherite_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/netherite_polearm_throwing.json deleted file mode 100644 index 39c652a5..00000000 --- a/src/main/resources/assets/unicopia/models/item/netherite_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/netherite_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/oak_basket.json b/src/main/resources/assets/unicopia/models/item/oak_basket.json deleted file mode 100644 index 6302a186..00000000 --- a/src/main/resources/assets/unicopia/models/item/oak_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/oak_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/oat_seeds.json b/src/main/resources/assets/unicopia/models/item/oat_seeds.json deleted file mode 100644 index 653d2e0f..00000000 --- a/src/main/resources/assets/unicopia/models/item/oat_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/oat_seeds" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/oatmeal.json b/src/main/resources/assets/unicopia/models/item/oatmeal.json deleted file mode 100644 index 1975a5aa..00000000 --- a/src/main/resources/assets/unicopia/models/item/oatmeal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/oatmeal" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/oats.json b/src/main/resources/assets/unicopia/models/item/oats.json deleted file mode 100644 index b2928654..00000000 --- a/src/main/resources/assets/unicopia/models/item/oats.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/oats" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/orange_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/orange_bed_sheets.json deleted file mode 100644 index 3744c6d5..00000000 --- a/src/main/resources/assets/unicopia/models/item/orange_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/orange_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/palm_basket.json b/src/main/resources/assets/unicopia/models/item/palm_basket.json deleted file mode 100644 index dea1c792..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/palm_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/palm_boat.json b/src/main/resources/assets/unicopia/models/item/palm_boat.json deleted file mode 100644 index 4ff232f9..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/palm_boat" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_button.json b/src/main/resources/assets/unicopia/models/item/palm_button.json deleted file mode 100644 index 27ed0c25..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_button_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_chest_boat.json b/src/main/resources/assets/unicopia/models/item/palm_chest_boat.json deleted file mode 100644 index f6ea0dc0..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_chest_boat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/palm_chest_boat" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_door.json b/src/main/resources/assets/unicopia/models/item/palm_door.json deleted file mode 100644 index 37111865..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/palm_door" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_fence.json b/src/main/resources/assets/unicopia/models/item/palm_fence.json deleted file mode 100644 index b25a044c..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_fence_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_fence_gate.json b/src/main/resources/assets/unicopia/models/item/palm_fence_gate.json deleted file mode 100644 index bf330530..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_fence_gate" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_hanging_sign.json b/src/main/resources/assets/unicopia/models/item/palm_hanging_sign.json deleted file mode 100644 index c3fed3ae..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_hanging_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/palm_hanging_sign" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_leaves.json b/src/main/resources/assets/unicopia/models/item/palm_leaves.json deleted file mode 100644 index 72642199..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_log.json b/src/main/resources/assets/unicopia/models/item/palm_log.json deleted file mode 100644 index 90c7e485..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_planks.json b/src/main/resources/assets/unicopia/models/item/palm_planks.json deleted file mode 100644 index ed53adda..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_planks" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_pressure_plate.json b/src/main/resources/assets/unicopia/models/item/palm_pressure_plate.json deleted file mode 100644 index 0ccd8787..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_pressure_plate" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_sapling.json b/src/main/resources/assets/unicopia/models/item/palm_sapling.json deleted file mode 100644 index 360c3260..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/palm_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/palm_sign.json b/src/main/resources/assets/unicopia/models/item/palm_sign.json deleted file mode 100644 index 9c622f85..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_sign.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/palm_sign" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_slab.json b/src/main/resources/assets/unicopia/models/item/palm_slab.json deleted file mode 100644 index f56bc668..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_stairs.json b/src/main/resources/assets/unicopia/models/item/palm_stairs.json deleted file mode 100644 index 6e961b60..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_trapdoor.json b/src/main/resources/assets/unicopia/models/item/palm_trapdoor.json deleted file mode 100644 index 32193397..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_trapdoor_bottom" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/palm_wood.json b/src/main/resources/assets/unicopia/models/item/palm_wood.json deleted file mode 100644 index d453bdfd..00000000 --- a/src/main/resources/assets/unicopia/models/item/palm_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/palm_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/pearl_necklace.json b/src/main/resources/assets/unicopia/models/item/pearl_necklace.json deleted file mode 100644 index 8716891e..00000000 --- a/src/main/resources/assets/unicopia/models/item/pearl_necklace.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/amulet", - "textures": { - "layer0": "unicopia:item/pearl_necklace" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pebbles.json b/src/main/resources/assets/unicopia/models/item/pebbles.json deleted file mode 100644 index b97fe49f..00000000 --- a/src/main/resources/assets/unicopia/models/item/pebbles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pebbles" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pegasus_amulet.json b/src/main/resources/assets/unicopia/models/item/pegasus_amulet.json deleted file mode 100644 index af01c043..00000000 --- a/src/main/resources/assets/unicopia/models/item/pegasus_amulet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/amulet", - "textures": { - "layer0": "unicopia:item/pegasus_amulet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pegasus_badge.json b/src/main/resources/assets/unicopia/models/item/pegasus_badge.json deleted file mode 100644 index ab10dde8..00000000 --- a/src/main/resources/assets/unicopia/models/item/pegasus_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pegasus_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pegasus_feather.json b/src/main/resources/assets/unicopia/models/item/pegasus_feather.json deleted file mode 100644 index 526fd2aa..00000000 --- a/src/main/resources/assets/unicopia/models/item/pegasus_feather.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pegasus_feather" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pinecone.json b/src/main/resources/assets/unicopia/models/item/pinecone.json deleted file mode 100644 index 1d72942f..00000000 --- a/src/main/resources/assets/unicopia/models/item/pinecone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pinecone" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pink_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/pink_bed_sheets.json deleted file mode 100644 index e5a20bc3..00000000 --- a/src/main/resources/assets/unicopia/models/item/pink_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pink_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json deleted file mode 100644 index 19c466aa..00000000 --- a/src/main/resources/assets/unicopia/models/item/purple_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/purple_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rain_cloud_jar.json b/src/main/resources/assets/unicopia/models/item/rain_cloud_jar.json deleted file mode 100644 index 46f325d2..00000000 --- a/src/main/resources/assets/unicopia/models/item/rain_cloud_jar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rain_cloud_jar" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_bed_sheets.json deleted file mode 100644 index 2cea2b40..00000000 --- a/src/main/resources/assets/unicopia/models/item/rainbow_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rainbow_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json deleted file mode 100644 index 7930b725..00000000 --- a/src/main/resources/assets/unicopia/models/item/rainbow_bpw_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rainbow_bpw_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json deleted file mode 100644 index 50c3f6c4..00000000 --- a/src/main/resources/assets/unicopia/models/item/rainbow_bpy_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rainbow_bpy_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json deleted file mode 100644 index 0b4d249f..00000000 --- a/src/main/resources/assets/unicopia/models/item/rainbow_pbg_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rainbow_pbg_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json deleted file mode 100644 index 94dd563f..00000000 --- a/src/main/resources/assets/unicopia/models/item/rainbow_pwr_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rainbow_pwr_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/red_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/red_bed_sheets.json deleted file mode 100644 index 7594a935..00000000 --- a/src/main/resources/assets/unicopia/models/item/red_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/red_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock.json b/src/main/resources/assets/unicopia/models/item/rock.json deleted file mode 100644 index f959182a..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_stew.json b/src/main/resources/assets/unicopia/models/item/rock_stew.json deleted file mode 100644 index 632b6863..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_stew.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_stew" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rotten_apple.json b/src/main/resources/assets/unicopia/models/item/rotten_apple.json deleted file mode 100644 index 19a75b16..00000000 --- a/src/main/resources/assets/unicopia/models/item/rotten_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rotten_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/salt_cube.json b/src/main/resources/assets/unicopia/models/item/salt_cube.json deleted file mode 100644 index 6fab94dd..00000000 --- a/src/main/resources/assets/unicopia/models/item/salt_cube.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/salt_cube" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/scallop_shell.json b/src/main/resources/assets/unicopia/models/item/scallop_shell.json deleted file mode 100644 index 779ff3eb..00000000 --- a/src/main/resources/assets/unicopia/models/item/scallop_shell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/scallop_shell" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/shelly.json b/src/main/resources/assets/unicopia/models/item/shelly.json deleted file mode 100644 index 9d5976c3..00000000 --- a/src/main/resources/assets/unicopia/models/item/shelly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/shelly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/sour_apple.json b/src/main/resources/assets/unicopia/models/item/sour_apple.json deleted file mode 100644 index a1050863..00000000 --- a/src/main/resources/assets/unicopia/models/item/sour_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sour_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/sour_apple_seeds.json b/src/main/resources/assets/unicopia/models/item/sour_apple_seeds.json deleted file mode 100644 index aaf85db0..00000000 --- a/src/main/resources/assets/unicopia/models/item/sour_apple_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sour_apple_seeds" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spellbook.json b/src/main/resources/assets/unicopia/models/item/spellbook.json deleted file mode 100644 index 2f2a4302..00000000 --- a/src/main/resources/assets/unicopia/models/item/spellbook.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spellbook" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spruce_basket.json b/src/main/resources/assets/unicopia/models/item/spruce_basket.json deleted file mode 100644 index 3ab54be5..00000000 --- a/src/main/resources/assets/unicopia/models/item/spruce_basket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spruce_basket" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/stone_polearm.json b/src/main/resources/assets/unicopia/models/item/stone_polearm.json deleted file mode 100644 index fc92f268..00000000 --- a/src/main/resources/assets/unicopia/models/item/stone_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/stone_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/stone_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/stone_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/stone_polearm_in_inventory.json deleted file mode 100644 index 2e9256ee..00000000 --- a/src/main/resources/assets/unicopia/models/item/stone_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/stone_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/stone_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/stone_polearm_throwing.json deleted file mode 100644 index 3e82373a..00000000 --- a/src/main/resources/assets/unicopia/models/item/stone_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/stone_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/storm_cloud_jar.json b/src/main/resources/assets/unicopia/models/item/storm_cloud_jar.json deleted file mode 100644 index a1af2ea1..00000000 --- a/src/main/resources/assets/unicopia/models/item/storm_cloud_jar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/storm_cloud_jar" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/stripped_palm_log.json b/src/main/resources/assets/unicopia/models/item/stripped_palm_log.json deleted file mode 100644 index f22f8113..00000000 --- a/src/main/resources/assets/unicopia/models/item/stripped_palm_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_palm_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/stripped_palm_wood.json b/src/main/resources/assets/unicopia/models/item/stripped_palm_wood.json deleted file mode 100644 index 1208e15f..00000000 --- a/src/main/resources/assets/unicopia/models/item/stripped_palm_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_palm_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/stripped_zap_log.json b/src/main/resources/assets/unicopia/models/item/stripped_zap_log.json deleted file mode 100644 index 808e8d26..00000000 --- a/src/main/resources/assets/unicopia/models/item/stripped_zap_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_zap_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/stripped_zap_wood.json b/src/main/resources/assets/unicopia/models/item/stripped_zap_wood.json deleted file mode 100644 index f1d170f0..00000000 --- a/src/main/resources/assets/unicopia/models/item/stripped_zap_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_zap_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple.json b/src/main/resources/assets/unicopia/models/item/sweet_apple.json deleted file mode 100644 index bfb72305..00000000 --- a/src/main/resources/assets/unicopia/models/item/sweet_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sweet_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json deleted file mode 100644 index cdbcc586..00000000 --- a/src/main/resources/assets/unicopia/models/item/sweet_apple_seeds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sweet_apple_seeds" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/amulet.json b/src/main/resources/assets/unicopia/models/item/template_amulet.json similarity index 100% rename from src/main/resources/assets/unicopia/models/item/amulet.json rename to src/main/resources/assets/unicopia/models/item/template_amulet.json diff --git a/src/main/resources/assets/unicopia/models/item/mug.json b/src/main/resources/assets/unicopia/models/item/template_mug.json similarity index 100% rename from src/main/resources/assets/unicopia/models/item/mug.json rename to src/main/resources/assets/unicopia/models/item/template_mug.json diff --git a/src/main/resources/assets/unicopia/models/item/toast.json b/src/main/resources/assets/unicopia/models/item/toast.json deleted file mode 100644 index 8d792a18..00000000 --- a/src/main/resources/assets/unicopia/models/item/toast.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/toast" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/tom.json b/src/main/resources/assets/unicopia/models/item/tom.json deleted file mode 100644 index c22e6ac2..00000000 --- a/src/main/resources/assets/unicopia/models/item/tom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/tom" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/turret_shell.json b/src/main/resources/assets/unicopia/models/item/turret_shell.json deleted file mode 100644 index 24bf2c41..00000000 --- a/src/main/resources/assets/unicopia/models/item/turret_shell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/turret_shell" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/unicorn_amulet.json b/src/main/resources/assets/unicopia/models/item/unicorn_amulet.json deleted file mode 100644 index 34d6c7ea..00000000 --- a/src/main/resources/assets/unicopia/models/item/unicorn_amulet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/amulet", - "textures": { - "layer0": "unicopia:item/unicorn_amulet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/unicorn_badge.json b/src/main/resources/assets/unicopia/models/item/unicorn_badge.json deleted file mode 100644 index 92eefb40..00000000 --- a/src/main/resources/assets/unicopia/models/item/unicorn_badge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/unicorn_badge" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json deleted file mode 100644 index 808e8d26..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_zap_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json b/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json deleted file mode 100644 index f1d170f0..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_stripped_zap_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/stripped_zap_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_fence.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_fence.json deleted file mode 100644 index c3ae00eb..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_fence_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_fence_gate.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_fence_gate.json deleted file mode 100644 index cb3f2d6c..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_fence_gate" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json deleted file mode 100644 index 13676b25..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json deleted file mode 100644 index 67af01e5..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_planks" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json deleted file mode 100644 index f4b16226..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json deleted file mode 100644 index 1a16895f..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json b/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json deleted file mode 100644 index 31ae309b..00000000 --- a/src/main/resources/assets/unicopia/models/item/waxed_zap_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/weird_rock.json b/src/main/resources/assets/unicopia/models/item/weird_rock.json deleted file mode 100644 index e35829c0..00000000 --- a/src/main/resources/assets/unicopia/models/item/weird_rock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/weird_rock" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/wheat_worms.json b/src/main/resources/assets/unicopia/models/item/wheat_worms.json deleted file mode 100644 index b5dd6e0f..00000000 --- a/src/main/resources/assets/unicopia/models/item/wheat_worms.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/wheat_worms" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/wooden_polearm.json b/src/main/resources/assets/unicopia/models/item/wooden_polearm.json deleted file mode 100644 index fa5b2759..00000000 --- a/src/main/resources/assets/unicopia/models/item/wooden_polearm.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "item/trident_in_hand", - "textures": { - "particle": "unicopia:item/wooden_polearm" - }, - "overrides": [ - { - "predicate": { - "throwing": 1 - }, - "model": "unicopia:item/wooden_polearm_throwing" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/wooden_polearm_in_inventory.json b/src/main/resources/assets/unicopia/models/item/wooden_polearm_in_inventory.json deleted file mode 100644 index 6dd937b6..00000000 --- a/src/main/resources/assets/unicopia/models/item/wooden_polearm_in_inventory.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/wooden_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/wooden_polearm_throwing.json b/src/main/resources/assets/unicopia/models/item/wooden_polearm_throwing.json deleted file mode 100644 index 8f087c5d..00000000 --- a/src/main/resources/assets/unicopia/models/item/wooden_polearm_throwing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/trident_throwing", - "textures": { - "particle": "unicopia:item/wooden_polearm" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json b/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json deleted file mode 100644 index 28d94756..00000000 --- a/src/main/resources/assets/unicopia/models/item/yellow_bed_sheets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/yellow_bed_sheets" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple.json b/src/main/resources/assets/unicopia/models/item/zap_apple.json deleted file mode 100644 index cf9e96a7..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/zap_apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_jam_jar.json b/src/main/resources/assets/unicopia/models/item/zap_apple_jam_jar.json deleted file mode 100644 index 394030ba..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_jam_jar.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/zap_apple_jam_jar" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_bulb.json b/src/main/resources/assets/unicopia/models/item/zap_bulb.json deleted file mode 100644 index 0fce5058..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/zap_bulb" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_fence.json b/src/main/resources/assets/unicopia/models/item/zap_fence.json deleted file mode 100644 index c3ae00eb..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_fence_inventory" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_fence_gate.json b/src/main/resources/assets/unicopia/models/item/zap_fence_gate.json deleted file mode 100644 index cb3f2d6c..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_fence_gate" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_log.json b/src/main/resources/assets/unicopia/models/item/zap_log.json deleted file mode 100644 index 13676b25..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_planks.json b/src/main/resources/assets/unicopia/models/item/zap_planks.json deleted file mode 100644 index 67af01e5..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_planks" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_slab.json b/src/main/resources/assets/unicopia/models/item/zap_slab.json deleted file mode 100644 index f4b16226..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_slab" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_stairs.json b/src/main/resources/assets/unicopia/models/item/zap_stairs.json deleted file mode 100644 index 1a16895f..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_stairs" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_wood.json b/src/main/resources/assets/unicopia/models/item/zap_wood.json deleted file mode 100644 index 31ae309b..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_wood" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zapling.json b/src/main/resources/assets/unicopia/models/item/zapling.json deleted file mode 100644 index 3c4bffea..00000000 --- a/src/main/resources/assets/unicopia/models/item/zapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/zapling" - } -} diff --git a/src/main/resources/assets/unicopia/textures/item/palm_sapling.png b/src/main/resources/assets/unicopia/textures/block/palm_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/palm_sapling.png rename to src/main/resources/assets/unicopia/textures/block/palm_sapling.png diff --git a/src/main/resources/assets/unicopia/textures/item/zapling.png b/src/main/resources/assets/unicopia/textures/block/zapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/zapling.png rename to src/main/resources/assets/unicopia/textures/block/zapling.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 41449c21..a372fd58 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -24,6 +24,9 @@ "client": [ "com.minelittlepony.unicopia.client.UnicopiaClient" ], + "fabric-datagen": [ + "com.minelittlepony.unicopia.datagen.Datagen" + ], "modmenu": [ "com.minelittlepony.unicopia.modmenu.UMenuFactory" ], From 5180c2ca5bf159f81cac7dd75f906d6cab6675b9 Mon Sep 17 00:00:00 2001 From: LingVarr Date: Wed, 13 Mar 2024 15:43:43 +1100 Subject: [PATCH 17/44] Update ru_ru.json --- .../resources/assets/unicopia/lang/ru_ru.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/unicopia/lang/ru_ru.json b/src/main/resources/assets/unicopia/lang/ru_ru.json index 9fd5ab76..00fc3c1d 100644 --- a/src/main/resources/assets/unicopia/lang/ru_ru.json +++ b/src/main/resources/assets/unicopia/lang/ru_ru.json @@ -612,6 +612,7 @@ "tag.unicopia.food_types.cooked_fish": "Готовая рыба", "tag.unicopia.food_types.raw_insect": "Жуки и насекомые", "tag.unicopia.food_types.cooked_insect": "Приготовленные жуки и насекомые", + "tag.unicopia.food_types.nuts_and_seeds": "Орехи и семена", "tag.unicopia.food_types.love": "Любовь", "tag.unicopia.food_types.rocks": "Камни", "tag.unicopia.food_types.pinecone": "Орехи и семена", @@ -622,6 +623,9 @@ "tag.unicopia.food_types.shelly": "Морские ракушки", "tag.unicopia.food_types.candy": "Конфеты", "tag.unicopia.food_types.desserts": "Десерты", + "tag.unicopia.food_types.fruit": "Фрукты", + "tag.unicopia.food_types.baked_goods": "Выпечка", + "tag.unicopia.food_types.misc": "Прочее", "tag.unicopia.food_types.fruits_and_vegetables": "Фрукты и овощи", "tag.unicopia.food_types.drinks": "Напитки", "tag.minecraft.leaves": "Листья", @@ -1307,16 +1311,27 @@ "key.unicopia.hud_page_up": "Следующая страница", "enchantment.unicopia.gem_finder": "Поиск самоцветов", + "enchantment.unicopia.gem_finder.desc": "Издает низкий гул, когда вы приближаетесь к ценным рудам", "enchantment.unicopia.padded": "Мягкость", - "enchantment.unicopia.clingy": "Цепление", + "enchantment.unicopia.padded.dec": "Защищает пегасов от ударов, заставляя их отскакивать от стен", + "enchantment.unicopia.clingy": "Цепкость", + "enchantment.unicopia.clingy.desc": "Заставляет предметы следовать за игроком при их выпадении", "enchantment.unicopia.repulsion": "Отталкивание", + "enchantment.unicopia.repulsion.desc": "Уменьшает гравитацию носителя", "enchantment.unicopia.heavy": "Тяжесть", + "enchantment.unicopia.heavy.desc": "Пегасы, носящие доспехи, становятся тяжелее и меньше подвержены влиянию магии и ветра", "enchantment.unicopia.herds": "Стада", + "enchantment.unicopia.herds.desc": "Оружие становится тем сильнее, чем больше союзников находится рядом", "enchantment.unicopia.want_it_need_it": "Хочу это, нужно это", + "enchantment.unicopia.want_it_need_it.desc": "Делает предмет очень желанным для мобов", "enchantment.unicopia.poisoned_joke": "Ядовитая шутка", + "enchantment.unicopia.poisoned_joke.desc": "Вызывает слуховые галлюцинации у того, кто носит предмет", "enchantment.unicopia.stressed": "Напряжённость", + "enchantment.unicopia.stressed.desc": "Приводит к дрожанию экрана, когда вам угрожает опасность", "enchantment.unicopia.heart_bound": "Связанный сердцем", + "enchantment.unicopia.heart_bound.desc": "Заставляет предмет оставаться с вами после смерти", "enchantment.unicopia.consumption": "Потребление", + "enchantment.unicopia.consumption.desc": "Преобразует предметы, добытые с помощью инструмента, в опыт", "commands.race.success.self": "Изменена раса на %1$s.", "commands.race.success": "%1$s изменил расу на %2$s.", @@ -1533,6 +1548,7 @@ "unicopia.subtitle.pegasus.molt": "Пегас теряет перо", "unicopia.subtitle.unicorn.teleport": "Звук магии", "unicopia.subtitle.player.wololo": "Вололо!", + "unicopia.subtitle.corrupt": "Порча магии", "unicopia.subtitle.entity.player.whistle": "Игрок свистит", "unicopia.subtitle.entity.player.kick": "Игрок бьёт", "unicopia.subtitle.magic_aura": "Магическое гудение", From bdc41c58c4c56258159233d7275c73e131f7d227 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 13 Mar 2024 21:37:09 +0000 Subject: [PATCH 18/44] Move yet more things to datagen --- .../datagen/providers/BlockModels.java | 21 ++ .../datagen/providers/ItemModels.java | 47 ++-- .../datagen/providers/ModelOverrides.java | 107 +++++++++ .../datagen/providers/UModelProvider.java | 76 ++++++- .../unicopia/entity/mob/ButterflyEntity.java | 5 +- .../blockstates/chiselled_chitin.json | 5 - .../blockstates/chiselled_chitin_slab.json | 7 - .../blockstates/chiselled_chitin_stairs.json | 209 ------------------ .../assets/unicopia/blockstates/cloud.json | 5 - .../blockstates/cloud_brick_slab.json | 7 - .../unicopia/blockstates/cloud_bricks.json | 5 - .../unicopia/blockstates/cloud_door.json | 68 ------ .../blockstates/cloud_plank_slab.json | 7 - .../unicopia/blockstates/cloud_planks.json | 5 - .../unicopia/blockstates/cloud_slab.json | 7 - .../unicopia/blockstates/crystal_door.json | 68 ------ .../unicopia/blockstates/curing_joke.json | 5 - .../blockstates/dark_oak_stable_door.json | 68 ------ .../unicopia/blockstates/dense_cloud.json | 5 - .../blockstates/dense_cloud_slab.json | 7 - .../unicopia/blockstates/etched_cloud.json | 5 - .../blockstates/etched_cloud_slab.json | 7 - .../unicopia/blockstates/golden_apple.json | 7 - .../blockstates/golden_oak_leaves.json | 7 - .../unicopia/blockstates/golden_oak_log.json | 16 -- .../blockstates/golden_oak_sapling.json | 7 - .../unicopia/blockstates/green_apple.json | 7 - .../blockstates/green_apple_sapling.json | 7 - .../assets/unicopia/blockstates/mango.json | 7 - .../unicopia/blockstates/mango_sapling.json | 7 - .../potted_golden_oak_sapling.json | 7 - .../potted_green_apple_sapling.json | 7 - .../blockstates/potted_mango_sapling.json | 7 - .../potted_sour_apple_sapling.json | 7 - .../potted_sweet_apple_sapling.json | 7 - .../unicopia/blockstates/sour_apple.json | 7 - .../blockstates/sour_apple_sapling.json | 7 - .../unicopia/blockstates/stable_door.json | 68 ------ .../unicopia/blockstates/sweet_apple.json | 7 - .../blockstates/sweet_apple_sapling.json | 7 - .../unicopia/blockstates/zap_apple.json | 7 - .../assets/unicopia/blockstates/zap_bulb.json | 7 - .../models/block/chiselled_chitin.json | 6 - .../models/block/chiselled_chitin_slab.json | 8 - .../block/chiselled_chitin_slab_top.json | 8 - .../models/block/chiselled_chitin_stairs.json | 8 - .../block/chiselled_chitin_stairs_inner.json | 8 - .../block/chiselled_chitin_stairs_outer.json | 8 - .../assets/unicopia/models/block/cloud.json | 6 - .../models/block/cloud_brick_slab.json | 8 - .../models/block/cloud_brick_slab_top.json | 8 - .../unicopia/models/block/cloud_bricks.json | 6 - .../models/block/cloud_plank_slab.json | 8 - .../models/block/cloud_plank_slab_top.json | 8 - .../unicopia/models/block/cloud_planks.json | 6 - .../unicopia/models/block/cloud_slab.json | 8 - .../unicopia/models/block/cloud_slab_top.json | 8 - .../unicopia/models/block/curing_joke.json | 6 - .../unicopia/models/block/dense_cloud.json | 6 - .../models/block/dense_cloud_slab.json | 8 - .../models/block/dense_cloud_slab_top.json | 8 - .../unicopia/models/block/door/bottom.json | 19 -- .../unicopia/models/block/door/bottom_rh.json | 19 -- .../models/block/door/cloud_bottom.json | 7 - .../models/block/door/cloud_bottom_rh.json | 7 - .../unicopia/models/block/door/cloud_top.json | 7 - .../models/block/door/cloud_top_rh.json | 7 - .../models/block/door/crystal_bottom.json | 7 - .../models/block/door/crystal_bottom_rh.json | 7 - .../models/block/door/crystal_top.json | 7 - .../models/block/door/crystal_top_rh.json | 7 - .../block/door/dark_oak_stable_bottom.json | 7 - .../block/door/dark_oak_stable_bottom_rh.json | 7 - .../block/door/dark_oak_stable_top.json | 7 - .../block/door/dark_oak_stable_top_rh.json | 7 - .../models/block/door/stable_bottom.json | 7 - .../models/block/door/stable_bottom_rh.json | 7 - .../models/block/door/stable_top.json | 7 - .../models/block/door/stable_top_rh.json | 7 - .../unicopia/models/block/door/top.json | 19 -- .../unicopia/models/block/door/top_rh.json | 19 -- .../unicopia/models/block/etched_cloud.json | 6 - .../models/block/etched_cloud_slab.json | 8 - .../models/block/etched_cloud_slab_top.json | 8 - .../unicopia/models/block/golden_apple.json | 6 - .../models/block/golden_oak_leaves.json | 6 - .../unicopia/models/block/golden_oak_log.json | 7 - .../block/golden_oak_log_horizontal.json | 7 - .../models/block/golden_oak_sapling.json | 6 - .../unicopia/models/block/green_apple.json | 6 - .../models/block/green_apple_sapling.json | 6 - .../assets/unicopia/models/block/mango.json | 6 - .../unicopia/models/block/mango_sapling.json | 6 - .../block/potted_golden_oak_sapling.json | 6 - .../block/potted_green_apple_sapling.json | 6 - .../models/block/potted_mango_sapling.json | 6 - .../block/potted_sour_apple_sapling.json | 6 - .../block/potted_sweet_apple_sapling.json | 6 - .../unicopia/models/block/sour_apple.json | 6 - .../models/block/sour_apple_sapling.json | 6 - .../unicopia/models/block/sweet_apple.json | 6 - .../models/block/sweet_apple_sapling.json | 6 - .../unicopia/models/block/zap_apple.json | 6 - .../unicopia/models/block/zap_bulb.json | 6 - .../unicopia/models/item/blue_butterfly.json | 6 - .../models/item/brimstone_butterfly.json | 6 - .../unicopia/models/item/butterfly.json | 22 -- .../unicopia/models/item/candied_apple.json | 20 -- .../models/item/candied_apple_bite1.json | 6 - .../models/item/candied_apple_bite2.json | 6 - .../models/item/chiselled_chitin.json | 3 - .../models/item/chiselled_chitin_slab.json | 3 - .../models/item/chiselled_chitin_stairs.json | 3 - .../assets/unicopia/models/item/cloud.json | 3 - .../models/item/cloud_brick_slab.json | 3 - .../unicopia/models/item/cloud_bricks.json | 3 - .../unicopia/models/item/cloud_door.json | 6 - .../models/item/cloud_plank_slab.json | 3 - .../unicopia/models/item/cloud_planks.json | 3 - .../unicopia/models/item/cloud_slab.json | 3 - .../unicopia/models/item/crystal_door.json | 6 - .../models/item/dark_oak_stable_door.json | 6 - .../unicopia/models/item/dense_cloud.json | 3 - .../models/item/dense_cloud_slab.json | 3 - .../unicopia/models/item/etched_cloud.json | 3 - .../models/item/etched_cloud_slab.json | 3 - .../models/item/golden_oak_leaves.json | 3 - .../unicopia/models/item/golden_oak_log.json | 3 - .../models/item/golden_oak_sapling.json | 6 - .../models/item/green_apple_sapling.json | 6 - .../unicopia/models/item/green_butterfly.json | 6 - .../models/item/hedylidae_butterfly.json | 6 - .../unicopia/models/item/lime_butterfly.json | 6 - .../models/item/lycaenidae_butterfly.json | 6 - .../models/item/magenta_butterfly.json | 6 - .../unicopia/models/item/magic_staff.json | 7 - .../unicopia/models/item/mango_sapling.json | 6 - .../models/item/monarch_butterfly.json | 6 - .../models/item/nymphalidae_butterfly.json | 6 - .../unicopia/models/item/pineapple.json | 20 -- .../unicopia/models/item/pineapple_bite1.json | 6 - .../unicopia/models/item/pineapple_bite2.json | 6 - .../unicopia/models/item/pineapple_crown.json | 6 - .../unicopia/models/item/pink_butterfly.json | 6 - .../models/item/purple_butterfly.json | 6 - .../unicopia/models/item/red_butterfly.json | 6 - .../unicopia/models/item/rock_candy.json | 98 -------- .../unicopia/models/item/rock_candy_10.json | 6 - .../unicopia/models/item/rock_candy_11.json | 6 - .../unicopia/models/item/rock_candy_12.json | 6 - .../unicopia/models/item/rock_candy_13.json | 6 - .../unicopia/models/item/rock_candy_14.json | 6 - .../unicopia/models/item/rock_candy_15.json | 6 - .../unicopia/models/item/rock_candy_16.json | 6 - .../unicopia/models/item/rock_candy_2.json | 6 - .../unicopia/models/item/rock_candy_3.json | 6 - .../unicopia/models/item/rock_candy_4.json | 6 - .../unicopia/models/item/rock_candy_5.json | 6 - .../unicopia/models/item/rock_candy_6.json | 6 - .../unicopia/models/item/rock_candy_7.json | 6 - .../unicopia/models/item/rock_candy_8.json | 6 - .../unicopia/models/item/rock_candy_9.json | 6 - .../models/item/sour_apple_sapling.json | 6 - .../unicopia/models/item/spectral_clock.json | 49 ---- .../models/item/spectral_clock_05.json | 6 - .../models/item/spectral_clock_10.json | 6 - .../models/item/spectral_clock_15.json | 6 - .../models/item/spectral_clock_20.json | 6 - .../models/item/spectral_clock_25.json | 6 - .../models/item/spectral_clock_30.json | 6 - .../models/item/spectral_clock_35.json | 6 - .../item/spectral_clock_flowering_00.json | 6 - .../item/spectral_clock_flowering_05.json | 6 - .../item/spectral_clock_flowering_10.json | 6 - .../item/spectral_clock_flowering_15.json | 6 - .../item/spectral_clock_flowering_20.json | 6 - .../item/spectral_clock_flowering_25.json | 6 - .../item/spectral_clock_flowering_30.json | 6 - .../item/spectral_clock_flowering_35.json | 6 - .../item/spectral_clock_fruiting_00.json | 6 - .../item/spectral_clock_fruiting_05.json | 6 - .../item/spectral_clock_fruiting_10.json | 6 - .../item/spectral_clock_fruiting_15.json | 6 - .../item/spectral_clock_fruiting_20.json | 6 - .../item/spectral_clock_fruiting_25.json | 6 - .../item/spectral_clock_fruiting_30.json | 6 - .../item/spectral_clock_fruiting_35.json | 6 - .../item/spectral_clock_greening_00.json | 6 - .../item/spectral_clock_greening_05.json | 6 - .../item/spectral_clock_greening_10.json | 6 - .../item/spectral_clock_greening_15.json | 6 - .../item/spectral_clock_greening_20.json | 6 - .../item/spectral_clock_greening_25.json | 6 - .../item/spectral_clock_greening_30.json | 6 - .../item/spectral_clock_greening_35.json | 6 - .../models/item/spectral_clock_ripe_00.json | 6 - .../models/item/spectral_clock_ripe_05.json | 6 - .../models/item/spectral_clock_ripe_10.json | 6 - .../models/item/spectral_clock_ripe_15.json | 6 - .../models/item/spectral_clock_ripe_20.json | 6 - .../models/item/spectral_clock_ripe_25.json | 6 - .../models/item/spectral_clock_ripe_30.json | 6 - .../models/item/spectral_clock_ripe_35.json | 6 - .../unicopia/models/item/stable_door.json | 6 - .../models/item/sweet_apple_sapling.json | 6 - .../models/item/white_monarch_butterfly.json | 6 - .../models/item/yellow_butterfly.json | 6 - ...d_door_lower.png => cloud_door_bottom.png} | Bin ...loud_door_upper.png => cloud_door_top.png} | Bin ...door_lower.png => crystal_door_bottom.png} | Bin ...al_door_upper.png => crystal_door_top.png} | Bin ...png.mcmeta => crystal_door_top.png.mcmeta} | 0 ...er.png => dark_oak_stable_door_bottom.png} | Bin ...upper.png => dark_oak_stable_door_top.png} | Bin .../{item => block}/golden_oak_sapling.png | Bin .../{item => block}/green_apple_sapling.png | Bin .../{item => block}/mango_sapling.png | Bin .../{item => block}/sour_apple_sapling.png | Bin ..._door_lower.png => stable_door_bottom.png} | Bin ...ble_door_upper.png => stable_door_top.png} | Bin .../{item => block}/sweet_apple_sapling.png | Bin 221 files changed, 226 insertions(+), 1955 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/ModelOverrides.java delete mode 100644 src/main/resources/assets/unicopia/blockstates/chiselled_chitin.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/chiselled_chitin_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/chiselled_chitin_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_brick_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_bricks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_door.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_plank_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_planks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/crystal_door.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/curing_joke.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/dark_oak_stable_door.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/etched_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/etched_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/golden_apple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/golden_oak_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/golden_oak_log.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/golden_oak_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/green_apple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/green_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/mango.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/mango_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_golden_oak_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_green_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_mango_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_sour_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/potted_sweet_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sour_apple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sour_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/stable_door.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_apple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_bulb.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_brick_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_brick_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_bricks.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_plank_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_plank_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/curing_joke.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/bottom_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/cloud_bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/cloud_bottom_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/cloud_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/cloud_top_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/crystal_bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/crystal_bottom_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/crystal_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/crystal_top_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/stable_bottom.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/stable_bottom_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/stable_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/stable_top_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/door/top_rh.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/golden_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/golden_oak_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/golden_oak_log.json delete mode 100644 src/main/resources/assets/unicopia/models/block/golden_oak_log_horizontal.json delete mode 100644 src/main/resources/assets/unicopia/models/block/golden_oak_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/green_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/green_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/mango.json delete mode 100644 src/main/resources/assets/unicopia/models/block/mango_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_golden_oak_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_green_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_mango_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_sour_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/potted_sweet_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sour_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sour_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_bulb.json delete mode 100644 src/main/resources/assets/unicopia/models/item/blue_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/brimstone_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/candied_apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/candied_apple_bite1.json delete mode 100644 src/main/resources/assets/unicopia/models/item/candied_apple_bite2.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chiselled_chitin.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chiselled_chitin_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chiselled_chitin_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_brick_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_bricks.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_door.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_plank_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_planks.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/crystal_door.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dark_oak_stable_door.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dense_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/etched_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/etched_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_oak_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_oak_log.json delete mode 100644 src/main/resources/assets/unicopia/models/item/golden_oak_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/hedylidae_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/lime_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/lycaenidae_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/magenta_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/magic_staff.json delete mode 100644 src/main/resources/assets/unicopia/models/item/mango_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/monarch_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/nymphalidae_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pineapple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pineapple_bite1.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pineapple_bite2.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pineapple_crown.json delete mode 100644 src/main/resources/assets/unicopia/models/item/pink_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/purple_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/red_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_11.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_12.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_13.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_14.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_16.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_2.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_3.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_4.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_5.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_6.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_7.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_8.json delete mode 100644 src/main/resources/assets/unicopia/models/item/rock_candy_9.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sour_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_05.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_20.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_25.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_30.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_35.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_00.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_05.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_20.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_25.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_30.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_35.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_00.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_05.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_20.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_25.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_30.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_35.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_00.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_05.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_20.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_25.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_30.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_greening_35.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_00.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_05.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_10.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_15.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_20.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_25.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_30.json delete mode 100644 src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_35.json delete mode 100644 src/main/resources/assets/unicopia/models/item/stable_door.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json delete mode 100644 src/main/resources/assets/unicopia/models/item/white_monarch_butterfly.json delete mode 100644 src/main/resources/assets/unicopia/models/item/yellow_butterfly.json rename src/main/resources/assets/unicopia/textures/block/{cloud_door_lower.png => cloud_door_bottom.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{cloud_door_upper.png => cloud_door_top.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{crystal_door_lower.png => crystal_door_bottom.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{crystal_door_upper.png => crystal_door_top.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{crystal_door_upper.png.mcmeta => crystal_door_top.png.mcmeta} (100%) rename src/main/resources/assets/unicopia/textures/block/{dark_oak_stable_door_lower.png => dark_oak_stable_door_bottom.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{dark_oak_stable_door_upper.png => dark_oak_stable_door_top.png} (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/golden_oak_sapling.png (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/green_apple_sapling.png (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/mango_sapling.png (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/sour_apple_sapling.png (100%) rename src/main/resources/assets/unicopia/textures/block/{stable_door_lower.png => stable_door_bottom.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{stable_door_upper.png => stable_door_top.png} (100%) rename src/main/resources/assets/unicopia/textures/{item => block}/sweet_apple_sapling.png (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java new file mode 100644 index 00000000..85e36cff --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -0,0 +1,21 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.Optional; + +import com.minelittlepony.unicopia.Unicopia; + +import net.minecraft.data.client.Model; +import net.minecraft.data.client.TextureKey; +import net.minecraft.util.Identifier; + +public interface BlockModels { + Model FRUIT = block("fruit", TextureKey.CROSS); + + static Model block(String parent, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(Unicopia.id("block/" + parent)), Optional.empty(), requiredTextureKeys); + } + + static Model block(Identifier parent, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.empty(), requiredTextureKeys); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java index d5e5a746..5e14ad9b 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java @@ -1,19 +1,20 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.Locale; import java.util.Optional; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.minelittlepony.unicopia.Unicopia; +import com.google.common.base.Strings; +import com.minelittlepony.unicopia.Unicopia; +import com.minelittlepony.unicopia.entity.mob.ButterflyEntity; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.Model; import net.minecraft.data.client.ModelIds; import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; import net.minecraft.item.Item; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; -import net.minecraft.util.Util; interface ItemModels { Model GENERATED = net.minecraft.data.client.Models.GENERATED; @@ -44,20 +45,30 @@ interface ItemModels { static void registerPolearm(ItemModelGenerator itemModelGenerator, Item item) { TextureMap textures = TextureMap.layer0(TextureMap.getId(item)); - Identifier throwingId = ModelIds.getItemSubModelId(item, "_throwing"); GENERATED.upload(ModelIds.getItemSubModelId(item, "_in_inventory"), textures, itemModelGenerator.writer); - TRIDENT_THROWING.upload(throwingId, textures, itemModelGenerator.writer); - TRIDENT_IN_HAND.upload(ModelIds.getItemModelId(item), textures, (id, jsonSupplier) -> { - itemModelGenerator.writer.accept(id, () -> Util.make(jsonSupplier.get(), json -> { - json.getAsJsonObject().add("overrides", Util.make(new JsonArray(), overrides -> { - overrides.add(Util.make(new JsonObject(), override -> { - override.addProperty("model", throwingId.toString()); - override.add("predicate", Util.make(new JsonObject(), predicate -> { - predicate.addProperty("throwing", 1); - })); - })); - })); - })); - }); + ModelOverrides.of(TRIDENT_IN_HAND) + .addOverride("throwing", 1, generator -> TRIDENT_THROWING.upload(ModelIds.getItemSubModelId(item, "_throwing"), textures, itemModelGenerator.writer)) + .upload(ModelIds.getItemModelId(item), textures, itemModelGenerator); + } + + static void registerButterfly(ItemModelGenerator itemModelGenerator, Item item) { + float step = 1F / ButterflyEntity.Variant.VALUES.length; + ModelOverrides.of(GENERATED).addUniform("variant", step, 1 - step, step, (i, value) -> { + String name = ButterflyEntity.Variant.byId(i + 1).name().toLowerCase(Locale.ROOT); + Identifier subModelId = Registries.ITEM.getId(item).withPath(p -> "item/" + name + "_" + p); + return GENERATED.upload(subModelId, TextureMap.layer0(subModelId), itemModelGenerator.writer); + }).upload(item, itemModelGenerator); + } + + static void registerSpectralBlock(ItemModelGenerator itemModelGenerator, Item item) { + final float step = 0.025F; + String[] suffexes = { "", "_greening", "_flowering", "_fruiting", "_ripe", "" }; + ModelOverrides.of(GENERATED).addUniform("unicopia:zap_cycle", 0, 1, step, (index, value) -> { + if (value < 0.0001 || value > 0.999F) { + return ModelIds.getItemModelId(item); + } + Identifier subModelId = ModelIds.getItemSubModelId(item, suffexes[index / 8] + "_" + Strings.padStart((index % 8) * 5 + "", 2, '0')); + return GENERATED.upload(subModelId, TextureMap.layer0(subModelId), itemModelGenerator.writer); + }).upload(item, "_00", itemModelGenerator); } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ModelOverrides.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ModelOverrides.java new file mode 100644 index 00000000..d5ff1b05 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ModelOverrides.java @@ -0,0 +1,107 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; + +import net.minecraft.data.client.ItemModelGenerator; +import net.minecraft.data.client.Model; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.TextureMap; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.Util; + +public final class ModelOverrides { + private final Model model; + private final List overrides = new ArrayList<>(); + + public static ModelOverrides of(Model model) { + return new ModelOverrides(model); + } + + private ModelOverrides(Model model) { + this.model = model; + } + + public ModelOverrides addUniform(String key, int from, int to, Identifier model) { + float step = 1F / to; + for (int index = from; index <= to; index++) { + addOverride(model.withSuffixedPath("_" + index), key, index * step); + } + return this; + } + + public ModelOverrides addUniform(String key, float from, float to, float step, ModelVariantSupplier childModelSupplier) { + int index = 0; + for (float value = from; value <= to; value += step) { + final int capture = index++; + final float capture2 = value; + addOverride(key, value, generator -> { + return childModelSupplier.upload(capture, capture2); + }); + } + return this; + } + + public ModelOverrides addOverride(Identifier modelId, String key, float value) { + return addOverride(modelId, TextureMap.layer0(modelId), key, value); + } + + public ModelOverrides addOverride(Identifier modelId, TextureMap textures, String key, float value) { + return addOverride(key, value, generator -> model.upload(modelId, textures, generator.writer)); + } + + public ModelOverrides addOverride(String key, float value, Function generator) { + return addOverride(Map.of(key, value), generator); + } + + public ModelOverrides addOverride(Map predicate, Function generator) { + overrides.add(new Override(predicate, generator)); + return this; + } + + public Identifier upload(Item item, ItemModelGenerator generator) { + return upload(item, "", generator); + } + + public Identifier upload(Item item, String suffex, ItemModelGenerator generator) { + return upload(ModelIds.getItemModelId(item), TextureMap.layer0(ModelIds.getItemSubModelId(item, suffex)), generator); + } + + public Identifier upload(Identifier id, TextureMap textures, ItemModelGenerator generator) { + List>> overrides = this.overrides.stream() + .map(override -> new Pair<>(override.model().apply(generator), override.predicate())) + .toList(); + + return model.upload(id, textures, (a, jsonSupplier) -> { + generator.writer.accept(a, () -> Util.make(jsonSupplier.get(), json -> { + json.getAsJsonObject().add("overrides", Util.make(new JsonArray(), array -> { + overrides.forEach(override -> { + array.add(writeOverride(override.getLeft(), override.getRight(), new JsonObject())); + }); + })); + })); + }); + } + + private JsonObject writeOverride(Identifier model, Map predicate, JsonObject json) { + json.addProperty("model", model.toString()); + json.add("predicate", Util.make(new JsonObject(), output -> { + predicate.forEach(output::addProperty); + })); + return json; + } + + private record Override(Map predicate, Function model) { + + } + + public interface ModelVariantSupplier { + Identifier upload(int index, float value); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 397022b0..d2d10119 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -1,11 +1,13 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.List; +import java.util.Map; + import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.server.world.UTreeGen; - +import com.minelittlepony.unicopia.server.world.Tree; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; @@ -13,10 +15,13 @@ import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.BlockStateModelGenerator.TintType; import net.minecraft.data.family.BlockFamily; import net.minecraft.item.Item; +import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.TextureKey; +import net.minecraft.data.client.TextureMap; public class UModelProvider extends FabricModelProvider { public UModelProvider(FabricDataOutput output) { @@ -25,6 +30,20 @@ public class UModelProvider extends FabricModelProvider { @Override public void generateBlockStateModels(BlockStateModelGenerator modelGenerator) { + + // cloud blocks + modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD).slab(UBlocks.CLOUD_SLAB);//.stairs(UBlocks.CLOUD_STAIRS); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.ETCHED_CLOUD).slab(UBlocks.ETCHED_CLOUD_SLAB);//.stairs(UBlocks.ETCHED_CLOUD_STAIRS); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.DENSE_CLOUD).slab(UBlocks.DENSE_CLOUD_SLAB);//.stairs(UBlocks.DENSE_CLOUD_STAIRS); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_PLANKS).slab(UBlocks.CLOUD_PLANK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); + modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_BRICKS).slab(UBlocks.CLOUD_BRICK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); + + // doors + List.of(UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR).forEach(modelGenerator::registerDoor); + + // chitin blocks + modelGenerator.registerCubeAllModelTexturePool(UBlocks.CHISELLED_CHITIN).stairs(UBlocks.CHISELLED_CHITIN_STAIRS).slab(UBlocks.CHISELLED_CHITIN_SLAB); + // palm wood registerLogSet(modelGenerator, UBlocks.PALM_LOG, UBlocks.PALM_WOOD); registerLogSet(modelGenerator, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); @@ -36,7 +55,6 @@ public class UModelProvider extends FabricModelProvider { .build()); modelGenerator.registerHangingSign(UBlocks.STRIPPED_PALM_LOG, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); modelGenerator.registerSimpleCubeAll(UBlocks.PALM_LEAVES); - modelGenerator.registerFlowerPotPlant(UTreeGen.BANANA_TREE.sapling().get(), UTreeGen.BANANA_TREE.pot().get(), TintType.NOT_TINTED); // zap wood modelGenerator.registerLog(UBlocks.ZAP_LOG) @@ -54,7 +72,31 @@ public class UModelProvider extends FabricModelProvider { .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) .group("wooden").unlockCriterionName("has_planks") .build()); - modelGenerator.registerFlowerPotPlant(UTreeGen.ZAP_APPLE_TREE.sapling().get(), UTreeGen.ZAP_APPLE_TREE.pot().get(), TintType.NOT_TINTED); + + // golden oak wood + modelGenerator.registerSimpleCubeAll(UBlocks.GOLDEN_OAK_LEAVES); + modelGenerator.registerLog(UBlocks.GOLDEN_OAK_LOG) + .log(UBlocks.GOLDEN_OAK_LOG); + + + + // plants + Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> { + modelGenerator.registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED); + }); + modelGenerator.registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); + + // fruit + Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, + UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, + UBlocks.MANGO, UItems.MANGO, + UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, + UBlocks.SWEET_APPLE, UItems.SWEET_APPLE, + UBlocks.ZAP_APPLE, UItems.ZAP_APPLE, + UBlocks.ZAP_BULB, UItems.ZAP_BULB + ).forEach((block, item) -> { + modelGenerator.registerSingleton(block, TextureMap.cross(Registries.ITEM.getId(item).withPrefixedPath("item/")), BlockModels.FRUIT); + }); } @Override @@ -62,7 +104,7 @@ public class UModelProvider extends FabricModelProvider { ItemModels.register(itemModelGenerator, UItems.ACORN, UItems.APPLE_PIE_HOOF, UItems.APPLE_PIE_SLICE, UItems.APPLE_PIE, UItems.BANANA, UItems.BOTCHED_GEM, UItems.BROKEN_SUNGLASSES, UItems.BURNED_JUICE, UItems.BURNED_TOAST, - UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, UItems.CURING_JOKE, + UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, UItems.DAFFODIL_DAISY_SANDWICH, UItems.DRAGON_BREATH_SCROLL, UItems.EMPTY_JAR, UItems.FRIENDSHIP_BRACELET, @@ -74,7 +116,7 @@ public class UModelProvider extends FabricModelProvider { UItems.LIGHTNING_JAR, UItems.MANGO, UItems.MUFFIN, UItems.OAT_SEEDS, UItems.OATMEAL, UItems.OATS, - UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, + UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, UItems.PINEAPPLE_CROWN, UItems.RAIN_CLOUD_JAR, UItems.ROCK_STEW, UItems.ROCK, UItems.ROTTEN_APPLE, UItems.SALT_CUBE, UItems.SCALLOP_SHELL, UItems.SHELLY, UItems.SOUR_APPLE_SEEDS, UItems.SOUR_APPLE, UItems.SPELLBOOK, UItems.STORM_CLOUD_JAR, UItems.SWEET_APPLE_SEEDS, UItems.SWEET_APPLE, @@ -116,13 +158,14 @@ public class UModelProvider extends FabricModelProvider { ItemModels.register(itemModelGenerator, ItemModels.HANDHELD_STAFF, UItems.MEADOWBROOKS_STAFF ); + ItemModels.item("handheld_staff", TextureKey.LAYER0, TextureKey.LAYER1).upload(ModelIds.getItemModelId(UItems.MAGIC_STAFF), new TextureMap() + .put(TextureKey.LAYER0, ModelIds.getItemSubModelId(UItems.MAGIC_STAFF, "_base")) + .put(TextureKey.LAYER1, ModelIds.getItemSubModelId(UItems.MAGIC_STAFF, "_magic")), itemModelGenerator.writer); // polearms - for (Item item : new Item[] { - UItems.DIAMOND_POLEARM, UItems.GOLDEN_POLEARM, UItems.NETHERITE_POLEARM, UItems.STONE_POLEARM, UItems.WOODEN_POLEARM, UItems.IRON_POLEARM - }) { + List.of(UItems.DIAMOND_POLEARM, UItems.GOLDEN_POLEARM, UItems.NETHERITE_POLEARM, UItems.STONE_POLEARM, UItems.WOODEN_POLEARM, UItems.IRON_POLEARM).forEach(item -> { ItemModels.registerPolearm(itemModelGenerator, item); - } + }); // sheets ItemModels.register(itemModelGenerator, BedsheetsItem.ITEMS.values().stream().toArray(Item[]::new)); @@ -131,6 +174,19 @@ public class UModelProvider extends FabricModelProvider { .map(race -> race.getId().withPath(p -> p + "_badge")) .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) .toArray(Item[]::new)); + + ItemModels.registerButterfly(itemModelGenerator, UItems.BUTTERFLY); + ItemModels.registerSpectralBlock(itemModelGenerator, UItems.SPECTRAL_CLOCK); + ModelOverrides.of(ItemModels.GENERATED) + .addUniform("count", 2, 16, ModelIds.getItemModelId(UItems.ROCK_CANDY)) + .upload(UItems.ROCK_CANDY, itemModelGenerator); + + List.of(UItems.PINEAPPLE, UItems.CANDIED_APPLE).forEach(item -> { + ModelOverrides.of(ItemModels.GENERATED) + .addOverride(ModelIds.getItemSubModelId(item, "_bite1"), "damage", 0.3F) + .addOverride(ModelIds.getItemSubModelId(item, "_bite2"), "damage", 0.6F) + .upload(item, itemModelGenerator); + }); } private void registerLogSet(BlockStateModelGenerator modelGenerator, Block log, Block wood) { diff --git a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java index b313e4fb..088529b2 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/ButterflyEntity.java @@ -386,12 +386,13 @@ public class ButterflyEntity extends AmbientEntity { public static final Variant[] VALUES = Variant.values(); private static final Map REGISTRY = Arrays.stream(VALUES).collect(Collectors.toMap(a -> a.name().toLowerCase(Locale.ROOT), Function.identity())); - private final Identifier skin = Unicopia.id("textures/entity/butterfly/" + name().toLowerCase() + ".png"); + private final Identifier skin = Unicopia.id("textures/entity/butterfly/" + name().toLowerCase(Locale.ROOT) + ".png"); public Identifier getSkin() { return skin; } - static Variant byId(int index) { + + public static Variant byId(int index) { return VALUES[Math.max(0, index) % VALUES.length]; } diff --git a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin.json b/src/main/resources/assets/unicopia/blockstates/chiselled_chitin.json deleted file mode 100644 index 43572cd5..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/chiselled_chitin" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_slab.json b/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_slab.json deleted file mode 100644 index 7a14a2e3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/chiselled_chitin" }, - "type=bottom": { "model": "unicopia:block/chiselled_chitin_slab" }, - "type=top": { "model": "unicopia:block/chiselled_chitin_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_stairs.json b/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_stairs.json deleted file mode 100644 index 745db71e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/chiselled_chitin_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/chiselled_chitin_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/chiselled_chitin_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/cloud.json b/src/main/resources/assets/unicopia/blockstates/cloud.json deleted file mode 100644 index 3afda0a3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_brick_slab.json b/src/main/resources/assets/unicopia/blockstates/cloud_brick_slab.json deleted file mode 100644 index 1ef1dad5..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_brick_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/cloud_bricks" }, - "type=bottom": { "model": "unicopia:block/cloud_brick_slab" }, - "type=top": { "model": "unicopia:block/cloud_brick_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_bricks.json b/src/main/resources/assets/unicopia/blockstates/cloud_bricks.json deleted file mode 100644 index 01037815..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_bricks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud_bricks" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_door.json b/src/main/resources/assets/unicopia/blockstates/cloud_door.json deleted file mode 100644 index e837d7f0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_door.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/cloud_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/cloud_top", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/cloud_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/cloud_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_plank_slab.json b/src/main/resources/assets/unicopia/blockstates/cloud_plank_slab.json deleted file mode 100644 index 67564af0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_plank_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/cloud_planks" }, - "type=bottom": { "model": "unicopia:block/cloud_plank_slab" }, - "type=top": { "model": "unicopia:block/cloud_plank_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_planks.json b/src/main/resources/assets/unicopia/blockstates/cloud_planks.json deleted file mode 100644 index 0d66024f..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_planks.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud_planks" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/cloud_slab.json deleted file mode 100644 index a6d27918..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/cloud" }, - "type=bottom": { "model": "unicopia:block/cloud_slab" }, - "type=top": { "model": "unicopia:block/cloud_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/crystal_door.json b/src/main/resources/assets/unicopia/blockstates/crystal_door.json deleted file mode 100644 index 15184fa7..00000000 --- a/src/main/resources/assets/unicopia/blockstates/crystal_door.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/crystal_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/crystal_top", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/crystal_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/crystal_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/curing_joke.json b/src/main/resources/assets/unicopia/blockstates/curing_joke.json deleted file mode 100644 index 20ea8e38..00000000 --- a/src/main/resources/assets/unicopia/blockstates/curing_joke.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/curing_joke" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/dark_oak_stable_door.json b/src/main/resources/assets/unicopia/blockstates/dark_oak_stable_door.json deleted file mode 100644 index 7cc92f37..00000000 --- a/src/main/resources/assets/unicopia/blockstates/dark_oak_stable_door.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/dark_oak_stable_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud.json deleted file mode 100644 index 53ceace7..00000000 --- a/src/main/resources/assets/unicopia/blockstates/dense_cloud.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/dense_cloud" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json deleted file mode 100644 index a6d27918..00000000 --- a/src/main/resources/assets/unicopia/blockstates/dense_cloud_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/cloud" }, - "type=bottom": { "model": "unicopia:block/cloud_slab" }, - "type=top": { "model": "unicopia:block/cloud_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/etched_cloud.json b/src/main/resources/assets/unicopia/blockstates/etched_cloud.json deleted file mode 100644 index 89ffa3ff..00000000 --- a/src/main/resources/assets/unicopia/blockstates/etched_cloud.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/etched_cloud" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/etched_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/etched_cloud_slab.json deleted file mode 100644 index faaf5c94..00000000 --- a/src/main/resources/assets/unicopia/blockstates/etched_cloud_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/etched_cloud" }, - "type=bottom": { "model": "unicopia:block/etched_cloud_slab" }, - "type=top": { "model": "unicopia:block/etched_cloud_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/golden_apple.json b/src/main/resources/assets/unicopia/blockstates/golden_apple.json deleted file mode 100644 index e0c679aa..00000000 --- a/src/main/resources/assets/unicopia/blockstates/golden_apple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/golden_apple" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/golden_oak_leaves.json b/src/main/resources/assets/unicopia/blockstates/golden_oak_leaves.json deleted file mode 100644 index b8084dfb..00000000 --- a/src/main/resources/assets/unicopia/blockstates/golden_oak_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/golden_oak_leaves" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/golden_oak_log.json b/src/main/resources/assets/unicopia/blockstates/golden_oak_log.json deleted file mode 100644 index 4f50529f..00000000 --- a/src/main/resources/assets/unicopia/blockstates/golden_oak_log.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "unicopia:block/golden_oak_log_horizontal", - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "unicopia:block/golden_oak_log" - }, - "axis=z": { - "model": "unicopia:block/golden_oak_log_horizontal", - "x": 90 - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/golden_oak_sapling.json b/src/main/resources/assets/unicopia/blockstates/golden_oak_sapling.json deleted file mode 100644 index 7288f548..00000000 --- a/src/main/resources/assets/unicopia/blockstates/golden_oak_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/golden_oak_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/green_apple.json b/src/main/resources/assets/unicopia/blockstates/green_apple.json deleted file mode 100644 index 45274496..00000000 --- a/src/main/resources/assets/unicopia/blockstates/green_apple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/green_apple" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/green_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/green_apple_sapling.json deleted file mode 100644 index cf5496de..00000000 --- a/src/main/resources/assets/unicopia/blockstates/green_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/green_apple_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/mango.json b/src/main/resources/assets/unicopia/blockstates/mango.json deleted file mode 100644 index 7941fcf8..00000000 --- a/src/main/resources/assets/unicopia/blockstates/mango.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/mango" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/mango_sapling.json b/src/main/resources/assets/unicopia/blockstates/mango_sapling.json deleted file mode 100644 index 751bec0e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/mango_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/mango_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/potted_golden_oak_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_golden_oak_sapling.json deleted file mode 100644 index 0ceb8e14..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_golden_oak_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_golden_oak_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/potted_green_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_green_apple_sapling.json deleted file mode 100644 index 69b2a3ca..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_green_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_green_apple_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/potted_mango_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_mango_sapling.json deleted file mode 100644 index 427a7b7c..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_mango_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_mango_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/potted_sour_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_sour_apple_sapling.json deleted file mode 100644 index 00aa2145..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_sour_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_sour_apple_sapling" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/potted_sweet_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/potted_sweet_apple_sapling.json deleted file mode 100644 index b8106136..00000000 --- a/src/main/resources/assets/unicopia/blockstates/potted_sweet_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/potted_sweet_apple_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sour_apple.json b/src/main/resources/assets/unicopia/blockstates/sour_apple.json deleted file mode 100644 index e3af10bf..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sour_apple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/sour_apple" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sour_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/sour_apple_sapling.json deleted file mode 100644 index c9ffeae9..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sour_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/sour_apple_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/stable_door.json b/src/main/resources/assets/unicopia/blockstates/stable_door.json deleted file mode 100644 index 01d4ec97..00000000 --- a/src/main/resources/assets/unicopia/blockstates/stable_door.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "variants": { - "facing=east,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=false": { "model": "unicopia:block/door/stable_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=false": { "model": "unicopia:block/door/stable_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=false": { "model": "unicopia:block/door/stable_top", "y": 180 }, - "facing=east,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom" }, - "facing=south,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 90 }, - "facing=west,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 180 }, - "facing=north,half=lower,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 270 }, - "facing=east,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom_rh" }, - "facing=south,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 90 }, - "facing=west,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 180 }, - "facing=north,half=lower,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 270 }, - "facing=east,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 90 }, - "facing=south,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 180 }, - "facing=west,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom_rh", "y": 270 }, - "facing=north,half=lower,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom_rh" }, - "facing=east,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 270 }, - "facing=south,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom" }, - "facing=west,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 90 }, - "facing=north,half=lower,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_bottom", "y": 180 }, - "facing=east,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_top" }, - "facing=south,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_top", "y": 90 }, - "facing=west,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_top", "y": 180 }, - "facing=north,half=upper,hinge=left,open=false,powered=true": { "model": "unicopia:block/door/stable_top", "y": 270 }, - "facing=east,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_top_rh" }, - "facing=south,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 90 }, - "facing=west,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 180 }, - "facing=north,half=upper,hinge=right,open=false,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 270 }, - "facing=east,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 90 }, - "facing=south,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 180 }, - "facing=west,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_top_rh", "y": 270 }, - "facing=north,half=upper,hinge=left,open=true,powered=true": { "model": "unicopia:block/door/stable_top_rh" }, - "facing=east,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_top", "y": 270 }, - "facing=south,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_top" }, - "facing=west,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_top", "y": 90 }, - "facing=north,half=upper,hinge=right,open=true,powered=true": { "model": "unicopia:block/door/stable_top", "y": 180 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple.json deleted file mode 100644 index 9438a847..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sweet_apple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/sweet_apple" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json deleted file mode 100644 index ab178dc2..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sapling.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/sweet_apple_sapling" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_apple.json b/src/main/resources/assets/unicopia/blockstates/zap_apple.json deleted file mode 100644 index 26404112..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_apple.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_apple" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_bulb.json b/src/main/resources/assets/unicopia/blockstates/zap_bulb.json deleted file mode 100644 index 65df6348..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_bulb.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/zap_bulb" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin.json deleted file mode 100644 index 273816c3..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab.json deleted file mode 100644 index dd575f47..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin", - "top": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab_top.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab_top.json deleted file mode 100644 index 98b9981a..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin", - "top": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs.json deleted file mode 100644 index cee4a924..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin", - "top": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_inner.json deleted file mode 100644 index da6801d3..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin", - "top": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_outer.json deleted file mode 100644 index 4a74f8c5..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin", - "top": "unicopia:block/chiselled_chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud.json b/src/main/resources/assets/unicopia/models/block/cloud.json deleted file mode 100644 index 73923250..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_brick_slab.json b/src/main/resources/assets/unicopia/models/block/cloud_brick_slab.json deleted file mode 100644 index eca5f0be..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_brick_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/cloud_bricks", - "side": "unicopia:block/cloud_bricks", - "top": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_brick_slab_top.json b/src/main/resources/assets/unicopia/models/block/cloud_brick_slab_top.json deleted file mode 100644 index 728c135f..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_brick_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/cloud_bricks", - "side": "unicopia:block/cloud_bricks", - "top": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_bricks.json b/src/main/resources/assets/unicopia/models/block/cloud_bricks.json deleted file mode 100644 index 6f81c05e..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_plank_slab.json b/src/main/resources/assets/unicopia/models/block/cloud_plank_slab.json deleted file mode 100644 index 7787f104..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_plank_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/cloud_planks", - "side": "unicopia:block/cloud_planks", - "top": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_plank_slab_top.json b/src/main/resources/assets/unicopia/models/block/cloud_plank_slab_top.json deleted file mode 100644 index 12de0ae3..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_plank_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/cloud_planks", - "side": "unicopia:block/cloud_planks", - "top": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_planks.json b/src/main/resources/assets/unicopia/models/block/cloud_planks.json deleted file mode 100644 index e01a2b2c..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_slab.json b/src/main/resources/assets/unicopia/models/block/cloud_slab.json deleted file mode 100644 index 5d896354..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/cloud", - "top": "unicopia:block/cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_slab_top.json b/src/main/resources/assets/unicopia/models/block/cloud_slab_top.json deleted file mode 100644 index 3866a2c3..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/cloud", - "top": "unicopia:block/cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/curing_joke.json b/src/main/resources/assets/unicopia/models/block/curing_joke.json deleted file mode 100644 index d99c056b..00000000 --- a/src/main/resources/assets/unicopia/models/block/curing_joke.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/curing_joke" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud.json b/src/main/resources/assets/unicopia/models/block/dense_cloud.json deleted file mode 100644 index e37ff40b..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json deleted file mode 100644 index 05ae2d19..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/dense_cloud", - "side": "unicopia:block/dense_cloud", - "top": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json deleted file mode 100644 index c756b02a..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/dense_cloud", - "side": "unicopia:block/dense_cloud", - "top": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/door/bottom.json b/src/main/resources/assets/unicopia/models/block/door/bottom.json deleted file mode 100644 index 3b908ce3..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/bottom.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#bottom" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#bottom", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#bottom", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "west" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#bottom" } - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/door/bottom_rh.json b/src/main/resources/assets/unicopia/models/block/door/bottom_rh.json deleted file mode 100644 index b5093774..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/bottom_rh.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#bottom" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#bottom", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#bottom", "cullface": "south" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#bottom", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" } - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/door/cloud_bottom.json b/src/main/resources/assets/unicopia/models/block/door/cloud_bottom.json deleted file mode 100644 index b5afc313..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/cloud_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom", - "textures": { - "bottom": "unicopia:block/cloud_door_lower", - "top": "unicopia:block/cloud_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/cloud_bottom_rh.json b/src/main/resources/assets/unicopia/models/block/door/cloud_bottom_rh.json deleted file mode 100644 index 575b5941..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/cloud_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom_rh", - "textures": { - "bottom": "unicopia:block/cloud_door_lower", - "top": "unicopia:block/cloud_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/cloud_top.json b/src/main/resources/assets/unicopia/models/block/door/cloud_top.json deleted file mode 100644 index 41bed4d6..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/cloud_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top", - "textures": { - "bottom": "unicopia:block/cloud_door_lower", - "top": "unicopia:block/cloud_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/cloud_top_rh.json b/src/main/resources/assets/unicopia/models/block/door/cloud_top_rh.json deleted file mode 100644 index fb1c6ad9..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/cloud_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top_rh", - "textures": { - "bottom": "unicopia:block/cloud_door_lower", - "top": "unicopia:block/cloud_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/crystal_bottom.json b/src/main/resources/assets/unicopia/models/block/door/crystal_bottom.json deleted file mode 100644 index ef81dfb9..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/crystal_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom", - "textures": { - "bottom": "unicopia:block/crystal_door_lower", - "top": "unicopia:block/crystal_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/crystal_bottom_rh.json b/src/main/resources/assets/unicopia/models/block/door/crystal_bottom_rh.json deleted file mode 100644 index 5919da7d..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/crystal_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom_rh", - "textures": { - "bottom": "unicopia:block/crystal_door_lower", - "top": "unicopia:block/crystal_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/crystal_top.json b/src/main/resources/assets/unicopia/models/block/door/crystal_top.json deleted file mode 100644 index f7ab0700..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/crystal_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top", - "textures": { - "bottom": "unicopia:block/crystal_door_lower", - "top": "unicopia:block/crystal_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/crystal_top_rh.json b/src/main/resources/assets/unicopia/models/block/door/crystal_top_rh.json deleted file mode 100644 index 9e7f150c..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/crystal_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top_rh", - "textures": { - "bottom": "unicopia:block/crystal_door_lower", - "top": "unicopia:block/crystal_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom.json b/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom.json deleted file mode 100644 index 80964112..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom", - "textures": { - "bottom": "unicopia:block/door_library_lower", - "top": "unicopia:block/door_library_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom_rh.json b/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom_rh.json deleted file mode 100644 index 2304df0e..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom_rh", - "textures": { - "bottom": "unicopia:block/door_library_lower", - "top": "unicopia:block/door_library_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top.json b/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top.json deleted file mode 100644 index f4b0fc2f..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top", - "textures": { - "bottom": "unicopia:block/door_library_lower", - "top": "unicopia:block/door_library_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top_rh.json b/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top_rh.json deleted file mode 100644 index 669abb48..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/dark_oak_stable_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top_rh", - "textures": { - "bottom": "unicopia:block/door_library_lower", - "top": "unicopia:block/door_library_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/stable_bottom.json b/src/main/resources/assets/unicopia/models/block/door/stable_bottom.json deleted file mode 100644 index efbfa9c1..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/stable_bottom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom", - "textures": { - "bottom": "unicopia:block/stable_door_lower", - "top": "unicopia:block/stable_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/stable_bottom_rh.json b/src/main/resources/assets/unicopia/models/block/door/stable_bottom_rh.json deleted file mode 100644 index 857535ec..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/stable_bottom_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/bottom_rh", - "textures": { - "bottom": "unicopia:block/stable_door_lower", - "top": "unicopia:block/stable_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/stable_top.json b/src/main/resources/assets/unicopia/models/block/door/stable_top.json deleted file mode 100644 index 18822b0b..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/stable_top.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top", - "textures": { - "bottom": "unicopia:block/stable_door_lower", - "top": "unicopia:block/stable_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/stable_top_rh.json b/src/main/resources/assets/unicopia/models/block/door/stable_top_rh.json deleted file mode 100644 index 29559c4d..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/stable_top_rh.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:block/door/top_rh", - "textures": { - "bottom": "unicopia:block/stable_door_lower", - "top": "unicopia:block/stable_door_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/door/top.json b/src/main/resources/assets/unicopia/models/block/door/top.json deleted file mode 100644 index 77b93084..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/top.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#top" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#top", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#top", "cullface": "south" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "west" }, - "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#top" } - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/door/top_rh.json b/src/main/resources/assets/unicopia/models/block/door/top_rh.json deleted file mode 100644 index 9bea9d05..00000000 --- a/src/main/resources/assets/unicopia/models/block/door/top_rh.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "ambientocclusion": false, - "textures": { - "particle": "#top" - }, - "elements": [ - { "from": [ 0, 0, 0 ], - "to": [ 3, 16, 16 ], - "faces": { - "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, - "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#top", "cullface": "north" }, - "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#top", "cullface": "south" }, - "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#top", "cullface": "west" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" } - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud.json b/src/main/resources/assets/unicopia/models/block/etched_cloud.json deleted file mode 100644 index 3bc4dc53..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/etched_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud_slab.json b/src/main/resources/assets/unicopia/models/block/etched_cloud_slab.json deleted file mode 100644 index 3e08552c..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/etched_cloud", - "side": "unicopia:block/etched_cloud", - "top": "unicopia:block/etched_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud_slab_top.json b/src/main/resources/assets/unicopia/models/block/etched_cloud_slab_top.json deleted file mode 100644 index 1e3a94a8..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/etched_cloud", - "side": "unicopia:block/etched_cloud", - "top": "unicopia:block/etched_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/golden_apple.json b/src/main/resources/assets/unicopia/models/block/golden_apple.json deleted file mode 100644 index a2a567a9..00000000 --- a/src/main/resources/assets/unicopia/models/block/golden_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "minecraft:item/golden_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/golden_oak_leaves.json b/src/main/resources/assets/unicopia/models/block/golden_oak_leaves.json deleted file mode 100644 index 0c8f2bd9..00000000 --- a/src/main/resources/assets/unicopia/models/block/golden_oak_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/golden_oak_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/golden_oak_log.json b/src/main/resources/assets/unicopia/models/block/golden_oak_log.json deleted file mode 100644 index d4909cb0..00000000 --- a/src/main/resources/assets/unicopia/models/block/golden_oak_log.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column", - "textures": { - "end": "unicopia:block/golden_oak_log_top", - "side": "unicopia:block/golden_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/golden_oak_log_horizontal.json b/src/main/resources/assets/unicopia/models/block/golden_oak_log_horizontal.json deleted file mode 100644 index 8dc80c7b..00000000 --- a/src/main/resources/assets/unicopia/models/block/golden_oak_log_horizontal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/cube_column_horizontal", - "textures": { - "end": "unicopia:block/golden_oak_log_top", - "side": "unicopia:block/golden_oak_log" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/golden_oak_sapling.json b/src/main/resources/assets/unicopia/models/block/golden_oak_sapling.json deleted file mode 100644 index c4c2ba33..00000000 --- a/src/main/resources/assets/unicopia/models/block/golden_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/golden_oak_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/green_apple.json b/src/main/resources/assets/unicopia/models/block/green_apple.json deleted file mode 100644 index b9e24b76..00000000 --- a/src/main/resources/assets/unicopia/models/block/green_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/green_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/green_apple_sapling.json deleted file mode 100644 index 347f7658..00000000 --- a/src/main/resources/assets/unicopia/models/block/green_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/green_apple_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/mango.json b/src/main/resources/assets/unicopia/models/block/mango.json deleted file mode 100644 index af25a18b..00000000 --- a/src/main/resources/assets/unicopia/models/block/mango.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/mango" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/mango_sapling.json b/src/main/resources/assets/unicopia/models/block/mango_sapling.json deleted file mode 100644 index e064e572..00000000 --- a/src/main/resources/assets/unicopia/models/block/mango_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/mango_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/potted_golden_oak_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_golden_oak_sapling.json deleted file mode 100644 index 3423faef..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_golden_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/golden_oak_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/potted_green_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_green_apple_sapling.json deleted file mode 100644 index b2d76a3a..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_green_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/green_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/potted_mango_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_mango_sapling.json deleted file mode 100644 index c076b71d..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_mango_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/mango_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/potted_sour_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_sour_apple_sapling.json deleted file mode 100644 index 6a5cd19e..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_sour_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/sour_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/potted_sweet_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/potted_sweet_apple_sapling.json deleted file mode 100644 index 84f2327a..00000000 --- a/src/main/resources/assets/unicopia/models/block/potted_sweet_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "unicopia:item/sweet_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/sour_apple.json b/src/main/resources/assets/unicopia/models/block/sour_apple.json deleted file mode 100644 index 2f532cb0..00000000 --- a/src/main/resources/assets/unicopia/models/block/sour_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/sour_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sour_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/sour_apple_sapling.json deleted file mode 100644 index 89a46a2c..00000000 --- a/src/main/resources/assets/unicopia/models/block/sour_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/sour_apple_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple.json b/src/main/resources/assets/unicopia/models/block/sweet_apple.json deleted file mode 100644 index fb677dfa..00000000 --- a/src/main/resources/assets/unicopia/models/block/sweet_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/sweet_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json deleted file mode 100644 index 2193d3a2..00000000 --- a/src/main/resources/assets/unicopia/models/block/sweet_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:item/sweet_apple_sapling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_apple.json b/src/main/resources/assets/unicopia/models/block/zap_apple.json deleted file mode 100644 index 4e0081c9..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/zap_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/zap_bulb.json b/src/main/resources/assets/unicopia/models/block/zap_bulb.json deleted file mode 100644 index 97329f1f..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_bulb.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/fruit", - "textures": { - "cross": "unicopia:item/zap_bulb" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/blue_butterfly.json b/src/main/resources/assets/unicopia/models/item/blue_butterfly.json deleted file mode 100644 index 5006b4ce..00000000 --- a/src/main/resources/assets/unicopia/models/item/blue_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/blue_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/brimstone_butterfly.json b/src/main/resources/assets/unicopia/models/item/brimstone_butterfly.json deleted file mode 100644 index 264d61b3..00000000 --- a/src/main/resources/assets/unicopia/models/item/brimstone_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/brimstone_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/butterfly.json b/src/main/resources/assets/unicopia/models/item/butterfly.json deleted file mode 100644 index 875fa092..00000000 --- a/src/main/resources/assets/unicopia/models/item/butterfly.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/butterfly" - }, - "overrides": [ - { "predicate": { "variant": 0.0666666666}, "model": "unicopia:item/yellow_butterfly" }, - { "predicate": { "variant": 0.1333333333}, "model": "unicopia:item/lime_butterfly" }, - { "predicate": { "variant": 0.2}, "model": "unicopia:item/red_butterfly" }, - { "predicate": { "variant": 0.2666666666}, "model": "unicopia:item/green_butterfly" }, - { "predicate": { "variant": 0.3333333333}, "model": "unicopia:item/blue_butterfly" }, - { "predicate": { "variant": 0.4}, "model": "unicopia:item/purple_butterfly" }, - { "predicate": { "variant": 0.4666666666}, "model": "unicopia:item/magenta_butterfly" }, - { "predicate": { "variant": 0.5333333333}, "model": "unicopia:item/pink_butterfly" }, - { "predicate": { "variant": 0.6}, "model": "unicopia:item/hedylidae_butterfly" }, - { "predicate": { "variant": 0.6666666666}, "model": "unicopia:item/lycaenidae_butterfly" }, - { "predicate": { "variant": 0.7333333333}, "model": "unicopia:item/nymphalidae_butterfly" }, - { "predicate": { "variant": 0.8}, "model": "unicopia:item/monarch_butterfly" }, - { "predicate": { "variant": 0.8666666666}, "model": "unicopia:item/white_monarch_butterfly" }, - { "predicate": { "variant": 0.9333333333}, "model": "unicopia:item/brimstone_butterfly" } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/candied_apple.json b/src/main/resources/assets/unicopia/models/item/candied_apple.json deleted file mode 100644 index 91b84c50..00000000 --- a/src/main/resources/assets/unicopia/models/item/candied_apple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/candied_apple" - }, - "overrides": [ - { - "predicate": { - "damage": 0.3 - }, - "model": "unicopia:item/candied_apple_bite1" - }, - { - "predicate": { - "damage": 0.6 - }, - "model": "unicopia:item/candied_apple_bite2" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/candied_apple_bite1.json b/src/main/resources/assets/unicopia/models/item/candied_apple_bite1.json deleted file mode 100644 index e821f8e5..00000000 --- a/src/main/resources/assets/unicopia/models/item/candied_apple_bite1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/candied_apple_bite1" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/candied_apple_bite2.json b/src/main/resources/assets/unicopia/models/item/candied_apple_bite2.json deleted file mode 100644 index 3916ef05..00000000 --- a/src/main/resources/assets/unicopia/models/item/candied_apple_bite2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/candied_apple_bite2" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/chiselled_chitin.json b/src/main/resources/assets/unicopia/models/item/chiselled_chitin.json deleted file mode 100644 index bfa56e41..00000000 --- a/src/main/resources/assets/unicopia/models/item/chiselled_chitin.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chiselled_chitin" -} diff --git a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_slab.json b/src/main/resources/assets/unicopia/models/item/chiselled_chitin_slab.json deleted file mode 100644 index ab11af9e..00000000 --- a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chiselled_chitin_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_stairs.json b/src/main/resources/assets/unicopia/models/item/chiselled_chitin_stairs.json deleted file mode 100644 index cb467c88..00000000 --- a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chiselled_chitin_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud.json b/src/main/resources/assets/unicopia/models/item/cloud.json deleted file mode 100644 index 7babfca8..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_brick_slab.json b/src/main/resources/assets/unicopia/models/item/cloud_brick_slab.json deleted file mode 100644 index d6177fa3..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_brick_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_brick_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_bricks.json b/src/main/resources/assets/unicopia/models/item/cloud_bricks.json deleted file mode 100644 index 1cc14a14..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_bricks" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_door.json b/src/main/resources/assets/unicopia/models/item/cloud_door.json deleted file mode 100644 index 6c3e3edb..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/cloud_door" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/cloud_plank_slab.json b/src/main/resources/assets/unicopia/models/item/cloud_plank_slab.json deleted file mode 100644 index 4ebd9c55..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_plank_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_plank_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_planks.json b/src/main/resources/assets/unicopia/models/item/cloud_planks.json deleted file mode 100644 index 6420436f..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_planks" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_slab.json b/src/main/resources/assets/unicopia/models/item/cloud_slab.json deleted file mode 100644 index 7f1b60e7..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/crystal_door.json b/src/main/resources/assets/unicopia/models/item/crystal_door.json deleted file mode 100644 index 2ff46655..00000000 --- a/src/main/resources/assets/unicopia/models/item/crystal_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/crystal_door" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/dark_oak_stable_door.json b/src/main/resources/assets/unicopia/models/item/dark_oak_stable_door.json deleted file mode 100644 index 6e363cb1..00000000 --- a/src/main/resources/assets/unicopia/models/item/dark_oak_stable_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/dark_oak_stable_door" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/dense_cloud.json b/src/main/resources/assets/unicopia/models/item/dense_cloud.json deleted file mode 100644 index e7d67c42..00000000 --- a/src/main/resources/assets/unicopia/models/item/dense_cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/dense_cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json b/src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json deleted file mode 100644 index fcc96c78..00000000 --- a/src/main/resources/assets/unicopia/models/item/dense_cloud_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/dense_cloud_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/etched_cloud.json b/src/main/resources/assets/unicopia/models/item/etched_cloud.json deleted file mode 100644 index 3ed47a0c..00000000 --- a/src/main/resources/assets/unicopia/models/item/etched_cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/etched_cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/etched_cloud_slab.json b/src/main/resources/assets/unicopia/models/item/etched_cloud_slab.json deleted file mode 100644 index fb4023b6..00000000 --- a/src/main/resources/assets/unicopia/models/item/etched_cloud_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/etched_cloud_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/golden_oak_leaves.json b/src/main/resources/assets/unicopia/models/item/golden_oak_leaves.json deleted file mode 100644 index 14afba2f..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_oak_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/golden_oak_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/golden_oak_log.json b/src/main/resources/assets/unicopia/models/item/golden_oak_log.json deleted file mode 100644 index 699482c5..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_oak_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/golden_oak_log" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/golden_oak_sapling.json b/src/main/resources/assets/unicopia/models/item/golden_oak_sapling.json deleted file mode 100644 index cc4be552..00000000 --- a/src/main/resources/assets/unicopia/models/item/golden_oak_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/golden_oak_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/green_apple_sapling.json b/src/main/resources/assets/unicopia/models/item/green_apple_sapling.json deleted file mode 100644 index fa137acd..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/green_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/green_butterfly.json b/src/main/resources/assets/unicopia/models/item/green_butterfly.json deleted file mode 100644 index f79317d9..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/green_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/hedylidae_butterfly.json b/src/main/resources/assets/unicopia/models/item/hedylidae_butterfly.json deleted file mode 100644 index 5151d763..00000000 --- a/src/main/resources/assets/unicopia/models/item/hedylidae_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/hedylidae_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/lime_butterfly.json b/src/main/resources/assets/unicopia/models/item/lime_butterfly.json deleted file mode 100644 index bbb36011..00000000 --- a/src/main/resources/assets/unicopia/models/item/lime_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/lime_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/lycaenidae_butterfly.json b/src/main/resources/assets/unicopia/models/item/lycaenidae_butterfly.json deleted file mode 100644 index e0457136..00000000 --- a/src/main/resources/assets/unicopia/models/item/lycaenidae_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/lycaenidae_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/magenta_butterfly.json b/src/main/resources/assets/unicopia/models/item/magenta_butterfly.json deleted file mode 100644 index dfe6072c..00000000 --- a/src/main/resources/assets/unicopia/models/item/magenta_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/magenta_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/magic_staff.json b/src/main/resources/assets/unicopia/models/item/magic_staff.json deleted file mode 100644 index c484178a..00000000 --- a/src/main/resources/assets/unicopia/models/item/magic_staff.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "unicopia:item/handheld_staff", - "textures": { - "layer0": "unicopia:item/magic_staff_base", - "layer1": "unicopia:item/magic_staff_magic" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/mango_sapling.json b/src/main/resources/assets/unicopia/models/item/mango_sapling.json deleted file mode 100644 index a7d65508..00000000 --- a/src/main/resources/assets/unicopia/models/item/mango_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/mango_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/monarch_butterfly.json b/src/main/resources/assets/unicopia/models/item/monarch_butterfly.json deleted file mode 100644 index 895dcb56..00000000 --- a/src/main/resources/assets/unicopia/models/item/monarch_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/monarch_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/nymphalidae_butterfly.json b/src/main/resources/assets/unicopia/models/item/nymphalidae_butterfly.json deleted file mode 100644 index 46a1dde2..00000000 --- a/src/main/resources/assets/unicopia/models/item/nymphalidae_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/nymphalidae_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pineapple.json b/src/main/resources/assets/unicopia/models/item/pineapple.json deleted file mode 100644 index 0c243a7f..00000000 --- a/src/main/resources/assets/unicopia/models/item/pineapple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pineapple" - }, - "overrides": [ - { - "predicate": { - "damage": 0.3 - }, - "model": "unicopia:item/pineapple_bite1" - }, - { - "predicate": { - "damage": 0.6 - }, - "model": "unicopia:item/pineapple_bite2" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/pineapple_bite1.json b/src/main/resources/assets/unicopia/models/item/pineapple_bite1.json deleted file mode 100644 index ebe3b66c..00000000 --- a/src/main/resources/assets/unicopia/models/item/pineapple_bite1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pineapple_bite1" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pineapple_bite2.json b/src/main/resources/assets/unicopia/models/item/pineapple_bite2.json deleted file mode 100644 index 044a6bce..00000000 --- a/src/main/resources/assets/unicopia/models/item/pineapple_bite2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pineapple_bite2" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pineapple_crown.json b/src/main/resources/assets/unicopia/models/item/pineapple_crown.json deleted file mode 100644 index c7ded5a0..00000000 --- a/src/main/resources/assets/unicopia/models/item/pineapple_crown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/pineapple_crown" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/pink_butterfly.json b/src/main/resources/assets/unicopia/models/item/pink_butterfly.json deleted file mode 100644 index 2093f6b6..00000000 --- a/src/main/resources/assets/unicopia/models/item/pink_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/pink_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/purple_butterfly.json b/src/main/resources/assets/unicopia/models/item/purple_butterfly.json deleted file mode 100644 index fc5a8214..00000000 --- a/src/main/resources/assets/unicopia/models/item/purple_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/purple_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/red_butterfly.json b/src/main/resources/assets/unicopia/models/item/red_butterfly.json deleted file mode 100644 index df49e71e..00000000 --- a/src/main/resources/assets/unicopia/models/item/red_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/red_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy.json b/src/main/resources/assets/unicopia/models/item/rock_candy.json deleted file mode 100644 index 915d5788..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy" - }, - "overrides": [ - { - "predicate": { - "count": 0.125 - }, - "model": "unicopia:item/rock_candy_2" - }, - { - "predicate": { - "count": 0.1875 - }, - "model": "unicopia:item/rock_candy_3" - }, - { - "predicate": { - "count": 0.25 - }, - "model": "unicopia:item/rock_candy_4" - }, - { - "predicate": { - "count": 0.3125 - }, - "model": "unicopia:item/rock_candy_5" - }, - { - "predicate": { - "count": 0.375 - }, - "model": "unicopia:item/rock_candy_6" - }, - { - "predicate": { - "count": 0.4375 - }, - "model": "unicopia:item/rock_candy_7" - }, - { - "predicate": { - "count": 0.5 - }, - "model": "unicopia:item/rock_candy_8" - }, - { - "predicate": { - "count": 0.5625 - }, - "model": "unicopia:item/rock_candy_9" - }, - { - "predicate": { - "count": 0.625 - }, - "model": "unicopia:item/rock_candy_10" - }, - { - "predicate": { - "count": 0.6875 - }, - "model": "unicopia:item/rock_candy_11" - }, - { - "predicate": { - "count": 0.75 - }, - "model": "unicopia:item/rock_candy_12" - }, - { - "predicate": { - "count": 0.8125 - }, - "model": "unicopia:item/rock_candy_13" - }, - { - "predicate": { - "count": 0.875 - }, - "model": "unicopia:item/rock_candy_14" - }, - { - "predicate": { - "count": 0.9375 - }, - "model": "unicopia:item/rock_candy_15" - }, - { - "predicate": { - "count": 1 - }, - "model": "unicopia:item/rock_candy_16" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_10.json b/src/main/resources/assets/unicopia/models/item/rock_candy_10.json deleted file mode 100644 index dc769dde..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_11.json b/src/main/resources/assets/unicopia/models/item/rock_candy_11.json deleted file mode 100644 index 3413773c..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_11.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_11" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_12.json b/src/main/resources/assets/unicopia/models/item/rock_candy_12.json deleted file mode 100644 index fe5a2ee9..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_12.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_12" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_13.json b/src/main/resources/assets/unicopia/models/item/rock_candy_13.json deleted file mode 100644 index 968023f9..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_13.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_13" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_14.json b/src/main/resources/assets/unicopia/models/item/rock_candy_14.json deleted file mode 100644 index 8cb9a972..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_14.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_14" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_15.json b/src/main/resources/assets/unicopia/models/item/rock_candy_15.json deleted file mode 100644 index 3167a8c8..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_16.json b/src/main/resources/assets/unicopia/models/item/rock_candy_16.json deleted file mode 100644 index 7b69cee4..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_16.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_16" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_2.json b/src/main/resources/assets/unicopia/models/item/rock_candy_2.json deleted file mode 100644 index 6d9c1d80..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_2" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_3.json b/src/main/resources/assets/unicopia/models/item/rock_candy_3.json deleted file mode 100644 index f070644f..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_3" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_4.json b/src/main/resources/assets/unicopia/models/item/rock_candy_4.json deleted file mode 100644 index 5c312718..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_4" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_5.json b/src/main/resources/assets/unicopia/models/item/rock_candy_5.json deleted file mode 100644 index d301e92c..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_5" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_6.json b/src/main/resources/assets/unicopia/models/item/rock_candy_6.json deleted file mode 100644 index cc0faa08..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_6" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_7.json b/src/main/resources/assets/unicopia/models/item/rock_candy_7.json deleted file mode 100644 index df0944ce..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_7" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_8.json b/src/main/resources/assets/unicopia/models/item/rock_candy_8.json deleted file mode 100644 index 42b77136..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_8" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/rock_candy_9.json b/src/main/resources/assets/unicopia/models/item/rock_candy_9.json deleted file mode 100644 index b5820608..00000000 --- a/src/main/resources/assets/unicopia/models/item/rock_candy_9.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/rock_candy_9" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/sour_apple_sapling.json b/src/main/resources/assets/unicopia/models/item/sour_apple_sapling.json deleted file mode 100644 index 5011ea3a..00000000 --- a/src/main/resources/assets/unicopia/models/item/sour_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sour_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock.json b/src/main/resources/assets/unicopia/models/item/spectral_clock.json deleted file mode 100644 index 7328e905..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_00" - }, - "overrides": [ - { "predicate": { "unicopia:zap_cycle": 0.000}, "model": "unicopia:item/spectral_clock" }, - { "predicate": { "unicopia:zap_cycle": 0.025}, "model": "unicopia:item/spectral_clock_05" }, - { "predicate": { "unicopia:zap_cycle": 0.050}, "model": "unicopia:item/spectral_clock_10" }, - { "predicate": { "unicopia:zap_cycle": 0.075}, "model": "unicopia:item/spectral_clock_15" }, - { "predicate": { "unicopia:zap_cycle": 0.100}, "model": "unicopia:item/spectral_clock_20" }, - { "predicate": { "unicopia:zap_cycle": 0.125}, "model": "unicopia:item/spectral_clock_25" }, - { "predicate": { "unicopia:zap_cycle": 0.150}, "model": "unicopia:item/spectral_clock_30" }, - { "predicate": { "unicopia:zap_cycle": 0.175}, "model": "unicopia:item/spectral_clock_35" }, - { "predicate": { "unicopia:zap_cycle": 0.200}, "model": "unicopia:item/spectral_clock_greening_00" }, - { "predicate": { "unicopia:zap_cycle": 0.225}, "model": "unicopia:item/spectral_clock_greening_05" }, - { "predicate": { "unicopia:zap_cycle": 0.250}, "model": "unicopia:item/spectral_clock_greening_10" }, - { "predicate": { "unicopia:zap_cycle": 0.275}, "model": "unicopia:item/spectral_clock_greening_15" }, - { "predicate": { "unicopia:zap_cycle": 0.300}, "model": "unicopia:item/spectral_clock_greening_20" }, - { "predicate": { "unicopia:zap_cycle": 0.325}, "model": "unicopia:item/spectral_clock_greening_25" }, - { "predicate": { "unicopia:zap_cycle": 0.350}, "model": "unicopia:item/spectral_clock_greening_30" }, - { "predicate": { "unicopia:zap_cycle": 0.375}, "model": "unicopia:item/spectral_clock_greening_35" }, - { "predicate": { "unicopia:zap_cycle": 0.400}, "model": "unicopia:item/spectral_clock_flowering_00" }, - { "predicate": { "unicopia:zap_cycle": 0.425}, "model": "unicopia:item/spectral_clock_flowering_05" }, - { "predicate": { "unicopia:zap_cycle": 0.450}, "model": "unicopia:item/spectral_clock_flowering_10" }, - { "predicate": { "unicopia:zap_cycle": 0.475}, "model": "unicopia:item/spectral_clock_flowering_15" }, - { "predicate": { "unicopia:zap_cycle": 0.500}, "model": "unicopia:item/spectral_clock_flowering_20" }, - { "predicate": { "unicopia:zap_cycle": 0.525}, "model": "unicopia:item/spectral_clock_flowering_25" }, - { "predicate": { "unicopia:zap_cycle": 0.550}, "model": "unicopia:item/spectral_clock_flowering_30" }, - { "predicate": { "unicopia:zap_cycle": 0.575}, "model": "unicopia:item/spectral_clock_flowering_35" }, - { "predicate": { "unicopia:zap_cycle": 0.600}, "model": "unicopia:item/spectral_clock_fruiting_00" }, - { "predicate": { "unicopia:zap_cycle": 0.625}, "model": "unicopia:item/spectral_clock_fruiting_05" }, - { "predicate": { "unicopia:zap_cycle": 0.650}, "model": "unicopia:item/spectral_clock_fruiting_10" }, - { "predicate": { "unicopia:zap_cycle": 0.675}, "model": "unicopia:item/spectral_clock_fruiting_15" }, - { "predicate": { "unicopia:zap_cycle": 0.700}, "model": "unicopia:item/spectral_clock_fruiting_20" }, - { "predicate": { "unicopia:zap_cycle": 0.725}, "model": "unicopia:item/spectral_clock_fruiting_25" }, - { "predicate": { "unicopia:zap_cycle": 0.750}, "model": "unicopia:item/spectral_clock_fruiting_30" }, - { "predicate": { "unicopia:zap_cycle": 0.775}, "model": "unicopia:item/spectral_clock_fruiting_35" }, - { "predicate": { "unicopia:zap_cycle": 0.800}, "model": "unicopia:item/spectral_clock_ripe_00" }, - { "predicate": { "unicopia:zap_cycle": 0.825}, "model": "unicopia:item/spectral_clock_ripe_05" }, - { "predicate": { "unicopia:zap_cycle": 0.850}, "model": "unicopia:item/spectral_clock_ripe_10" }, - { "predicate": { "unicopia:zap_cycle": 0.875}, "model": "unicopia:item/spectral_clock_ripe_15" }, - { "predicate": { "unicopia:zap_cycle": 0.900}, "model": "unicopia:item/spectral_clock_ripe_20" }, - { "predicate": { "unicopia:zap_cycle": 0.925}, "model": "unicopia:item/spectral_clock_ripe_25" }, - { "predicate": { "unicopia:zap_cycle": 0.95}, "model": "unicopia:item/spectral_clock_ripe_30" }, - { "predicate": { "unicopia:zap_cycle": 0.975}, "model": "unicopia:item/spectral_clock_ripe_35" }, - { "predicate": { "unicopia:zap_cycle": 1.00}, "model": "unicopia:item/spectral_clock" } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_05.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_05.json deleted file mode 100644 index e4214c69..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_05.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_05" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_10.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_10.json deleted file mode 100644 index 93494e06..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_15.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_15.json deleted file mode 100644 index 47fd5aae..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_20.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_20.json deleted file mode 100644 index 1f5e9555..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_20.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_20" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_25.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_25.json deleted file mode 100644 index 8bc63305..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_25.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_25" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_30.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_30.json deleted file mode 100644 index a570c164..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_30.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_30" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_35.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_35.json deleted file mode 100644 index 847b370c..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_35.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_35" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_00.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_00.json deleted file mode 100644 index f2f18e39..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_00.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_00" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_05.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_05.json deleted file mode 100644 index bb124dd8..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_05.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_05" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_10.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_10.json deleted file mode 100644 index b4e54dd5..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_15.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_15.json deleted file mode 100644 index 024df18b..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_20.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_20.json deleted file mode 100644 index 86052382..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_20.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_20" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_25.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_25.json deleted file mode 100644 index 7a8b7bdc..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_25.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_25" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_30.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_30.json deleted file mode 100644 index 1be597da..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_30.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_30" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_35.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_35.json deleted file mode 100644 index 5feeec80..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_flowering_35.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_flowering_35" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_00.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_00.json deleted file mode 100644 index 5f8c076a..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_00.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_00" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_05.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_05.json deleted file mode 100644 index d55c7a55..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_05.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_05" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_10.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_10.json deleted file mode 100644 index b93324ef..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_15.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_15.json deleted file mode 100644 index 83965103..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_20.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_20.json deleted file mode 100644 index de03836b..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_20.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_20" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_25.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_25.json deleted file mode 100644 index 6bf6d0f4..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_25.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_25" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_30.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_30.json deleted file mode 100644 index aa2b154c..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_30.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_30" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_35.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_35.json deleted file mode 100644 index 9e16293d..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_fruiting_35.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_fruiting_35" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_00.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_00.json deleted file mode 100644 index 6fe39684..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_00.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_00" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_05.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_05.json deleted file mode 100644 index f732e41b..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_05.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_05" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_10.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_10.json deleted file mode 100644 index 025817fb..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_15.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_15.json deleted file mode 100644 index 3b1bf2a7..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_20.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_20.json deleted file mode 100644 index b3f8251e..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_20.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_20" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_25.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_25.json deleted file mode 100644 index 3a0dbe6e..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_25.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_25" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_30.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_30.json deleted file mode 100644 index 17b96af7..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_30.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_30" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_35.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_35.json deleted file mode 100644 index 33f711fd..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_greening_35.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_greening_35" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_00.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_00.json deleted file mode 100644 index 047312c3..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_00.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_00" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_05.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_05.json deleted file mode 100644 index 6ebd0392..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_05.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_05" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_10.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_10.json deleted file mode 100644 index 07566221..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_10.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_10" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_15.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_15.json deleted file mode 100644 index 852542b1..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_15.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_15" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_20.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_20.json deleted file mode 100644 index 9a3d23d5..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_20.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_20" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_25.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_25.json deleted file mode 100644 index 54944856..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_25.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_25" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_30.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_30.json deleted file mode 100644 index c5b298ee..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_30.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_30" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_35.json b/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_35.json deleted file mode 100644 index 6e5c32f8..00000000 --- a/src/main/resources/assets/unicopia/models/item/spectral_clock_ripe_35.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/spectral_clock_ripe_35" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/stable_door.json b/src/main/resources/assets/unicopia/models/item/stable_door.json deleted file mode 100644 index 91dffae0..00000000 --- a/src/main/resources/assets/unicopia/models/item/stable_door.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "unicopia:item/stable_door" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json deleted file mode 100644 index 824db059..00000000 --- a/src/main/resources/assets/unicopia/models/item/sweet_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/sweet_apple_sapling" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/white_monarch_butterfly.json b/src/main/resources/assets/unicopia/models/item/white_monarch_butterfly.json deleted file mode 100644 index e89aa594..00000000 --- a/src/main/resources/assets/unicopia/models/item/white_monarch_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/white_monarch_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/yellow_butterfly.json b/src/main/resources/assets/unicopia/models/item/yellow_butterfly.json deleted file mode 100644 index c4d12496..00000000 --- a/src/main/resources/assets/unicopia/models/item/yellow_butterfly.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:item/mug", - "textures": { - "layer0": "unicopia:item/yellow_butterfly" - } -} diff --git a/src/main/resources/assets/unicopia/textures/block/cloud_door_lower.png b/src/main/resources/assets/unicopia/textures/block/cloud_door_bottom.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/cloud_door_lower.png rename to src/main/resources/assets/unicopia/textures/block/cloud_door_bottom.png diff --git a/src/main/resources/assets/unicopia/textures/block/cloud_door_upper.png b/src/main/resources/assets/unicopia/textures/block/cloud_door_top.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/cloud_door_upper.png rename to src/main/resources/assets/unicopia/textures/block/cloud_door_top.png diff --git a/src/main/resources/assets/unicopia/textures/block/crystal_door_lower.png b/src/main/resources/assets/unicopia/textures/block/crystal_door_bottom.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/crystal_door_lower.png rename to src/main/resources/assets/unicopia/textures/block/crystal_door_bottom.png diff --git a/src/main/resources/assets/unicopia/textures/block/crystal_door_upper.png b/src/main/resources/assets/unicopia/textures/block/crystal_door_top.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/crystal_door_upper.png rename to src/main/resources/assets/unicopia/textures/block/crystal_door_top.png diff --git a/src/main/resources/assets/unicopia/textures/block/crystal_door_upper.png.mcmeta b/src/main/resources/assets/unicopia/textures/block/crystal_door_top.png.mcmeta similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/crystal_door_upper.png.mcmeta rename to src/main/resources/assets/unicopia/textures/block/crystal_door_top.png.mcmeta diff --git a/src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_lower.png b/src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_bottom.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_lower.png rename to src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_bottom.png diff --git a/src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_upper.png b/src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_top.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_upper.png rename to src/main/resources/assets/unicopia/textures/block/dark_oak_stable_door_top.png diff --git a/src/main/resources/assets/unicopia/textures/item/golden_oak_sapling.png b/src/main/resources/assets/unicopia/textures/block/golden_oak_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/golden_oak_sapling.png rename to src/main/resources/assets/unicopia/textures/block/golden_oak_sapling.png diff --git a/src/main/resources/assets/unicopia/textures/item/green_apple_sapling.png b/src/main/resources/assets/unicopia/textures/block/green_apple_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/green_apple_sapling.png rename to src/main/resources/assets/unicopia/textures/block/green_apple_sapling.png diff --git a/src/main/resources/assets/unicopia/textures/item/mango_sapling.png b/src/main/resources/assets/unicopia/textures/block/mango_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/mango_sapling.png rename to src/main/resources/assets/unicopia/textures/block/mango_sapling.png diff --git a/src/main/resources/assets/unicopia/textures/item/sour_apple_sapling.png b/src/main/resources/assets/unicopia/textures/block/sour_apple_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/sour_apple_sapling.png rename to src/main/resources/assets/unicopia/textures/block/sour_apple_sapling.png diff --git a/src/main/resources/assets/unicopia/textures/block/stable_door_lower.png b/src/main/resources/assets/unicopia/textures/block/stable_door_bottom.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/stable_door_lower.png rename to src/main/resources/assets/unicopia/textures/block/stable_door_bottom.png diff --git a/src/main/resources/assets/unicopia/textures/block/stable_door_upper.png b/src/main/resources/assets/unicopia/textures/block/stable_door_top.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/stable_door_upper.png rename to src/main/resources/assets/unicopia/textures/block/stable_door_top.png diff --git a/src/main/resources/assets/unicopia/textures/item/sweet_apple_sapling.png b/src/main/resources/assets/unicopia/textures/block/sweet_apple_sapling.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/sweet_apple_sapling.png rename to src/main/resources/assets/unicopia/textures/block/sweet_apple_sapling.png From 1bf698cf5da7b5c8c203283f20fdd9b21156cfdc Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 14 Mar 2024 16:29:22 +0000 Subject: [PATCH 19/44] Move flattened blocks to datagen --- .../datagen/providers/BlockModels.java | 62 +++- .../datagen/providers/UModelProvider.java | 4 + .../unicopia/blockstates/compacted_cloud.json | 268 ------------------ .../blockstates/compacted_cloud_bricks.json | 268 ------------------ .../blockstates/compacted_cloud_planks.json | 268 ------------------ .../blockstates/compacted_dense_cloud.json | 268 ------------------ .../blockstates/compacted_etched_cloud.json | 268 ------------------ .../flattened_cloud_bricks_corner_full.json | 6 - .../flattened_cloud_bricks_corner_x.json | 6 - .../flattened_cloud_bricks_corner_xy.json | 6 - .../flattened_cloud_bricks_corner_xyz.json | 6 - .../flattened_cloud_bricks_corner_xz.json | 6 - .../flattened_cloud_bricks_corner_y.json | 6 - .../flattened_cloud_bricks_corner_yz.json | 6 - .../flattened_cloud_bricks_corner_z.json | 6 - .../flattened_cloud_planks_corner_full.json | 6 - .../flattened_cloud_planks_corner_x.json | 6 - .../flattened_cloud_planks_corner_xy.json | 6 - .../flattened_cloud_planks_corner_xyz.json | 6 - .../flattened_cloud_planks_corner_xz.json | 6 - .../flattened_cloud_planks_corner_y.json | 6 - .../flattened_cloud_planks_corner_yz.json | 6 - .../flattened_cloud_planks_corner_z.json | 6 - ...r_full.json => flattened_corner_full.json} | 0 ..._corner_x.json => flattened_corner_x.json} | 0 ...orner_xy.json => flattened_corner_xy.json} | 0 ...ner_xyz.json => flattened_corner_xyz.json} | 0 ...orner_xz.json => flattened_corner_xz.json} | 0 ..._corner_y.json => flattened_corner_y.json} | 0 ...orner_yz.json => flattened_corner_yz.json} | 0 ..._corner_z.json => flattened_corner_z.json} | 0 31 files changed, 64 insertions(+), 1438 deletions(-) delete mode 100644 src/main/resources/assets/unicopia/blockstates/compacted_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/compacted_cloud_bricks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/compacted_cloud_planks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/compacted_dense_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/compacted_etched_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_full.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_x.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xy.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xyz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_y.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_yz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_z.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_full.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_x.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xy.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xyz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_y.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_yz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_z.json rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_full.json => flattened_corner_full.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_x.json => flattened_corner_x.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_xy.json => flattened_corner_xy.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_xyz.json => flattened_corner_xyz.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_xz.json => flattened_corner_xz.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_y.json => flattened_corner_y.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_yz.json => flattened_corner_yz.json} (100%) rename src/main/resources/assets/unicopia/models/block/{flattened_cloud_corner_z.json => flattened_corner_z.json} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java index 85e36cff..46285665 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -1,21 +1,79 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.Arrays; +import java.util.List; import java.util.Optional; - import com.minelittlepony.unicopia.Unicopia; - +import net.minecraft.block.Block; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateSupplier; +import net.minecraft.data.client.BlockStateVariant; import net.minecraft.data.client.Model; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.MultipartBlockStateSupplier; import net.minecraft.data.client.TextureKey; +import net.minecraft.data.client.TextureMap; +import net.minecraft.data.client.VariantSettings; +import net.minecraft.data.client.When; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; public interface BlockModels { Model FRUIT = block("fruit", TextureKey.CROSS); + String[] FLATTENED_MODEL_SUFFEXES = {"xyz", "yz", "xy", "y", "xz", "z", "x", "full"}; + String[] FLATTENED_MODEL_SUFFEXES_ROT = {"xyz", "xy", "yz", "y", "xz", "x", "z", "full"}; + VariantSettings.Rotation[] FLATTENED_MODEL_ROTATIONS = { + VariantSettings.Rotation.R0, VariantSettings.Rotation.R270, VariantSettings.Rotation.R90, VariantSettings.Rotation.R180, + VariantSettings.Rotation.R270, VariantSettings.Rotation.R180, VariantSettings.Rotation.R0, VariantSettings.Rotation.R90 + }; + + List FLATTENED_MODELS = Arrays.stream(FLATTENED_MODEL_SUFFEXES) + .map(suffex -> "_corner_" + suffex) + .map(variant -> block("flattened" + variant, variant, TextureKey.ALL)) + .toList(); + static Model block(String parent, TextureKey ... requiredTextureKeys) { return new Model(Optional.of(Unicopia.id("block/" + parent)), Optional.empty(), requiredTextureKeys); } + static Model block(String parent, String variant, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(Unicopia.id("block/" + parent)), Optional.of(variant), requiredTextureKeys); + } + static Model block(Identifier parent, TextureKey ... requiredTextureKeys) { return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.empty(), requiredTextureKeys); } + + static void registerCompactedBlock(BlockStateModelGenerator modelGenerator, Block block) { + FLATTENED_MODELS.forEach(model -> { + model.upload(block, TextureMap.all(ModelIds.getBlockModelId(block).withPath(p -> p.replace("compacted_", ""))), modelGenerator.modelCollector); + }); + modelGenerator.blockStateCollector.accept(createCompactedBlockState(block)); + } + + static BlockStateSupplier createCompactedBlockState(Block block) { + MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(block); + for (byte i = 0; i < FLATTENED_MODEL_ROTATIONS.length; i++) { + final BooleanProperty yAxis = (i & 0b100) == 0 ? Properties.DOWN : Properties.UP; + final BooleanProperty xAxis = (i & 0b010) == 0 ? Properties.NORTH: Properties.SOUTH; + final BooleanProperty zAxis = (i & 0b001) == 0 ? Properties.EAST : Properties.WEST; + final VariantSettings.Rotation xRot = yAxis == Properties.DOWN ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R180; + final VariantSettings.Rotation yRot = FLATTENED_MODEL_ROTATIONS[i]; + final String[] suffexes = yRot.ordinal() % 2 == 0 ? FLATTENED_MODEL_SUFFEXES : FLATTENED_MODEL_SUFFEXES_ROT; + for (byte v = 0; v < suffexes.length; v++) { + supplier.with(When.create() + .set(yAxis, (v & 0b100) != 0) + .set(xAxis, (v & 0b010) != 0) + .set(zAxis, (v & 0b001) != 0), BlockStateVariant.create() + .put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v])) + .put(VariantSettings.UVLOCK, true) + .put(VariantSettings.X, xRot) + .put(VariantSettings.Y, yRot) + ); + } + } + return supplier; + } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index d2d10119..11df3b3a 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -38,6 +38,10 @@ public class UModelProvider extends FabricModelProvider { modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_PLANKS).slab(UBlocks.CLOUD_PLANK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_BRICKS).slab(UBlocks.CLOUD_BRICK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); + List.of(UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_DENSE_CLOUD, UBlocks.COMPACTED_ETCHED_CLOUD).forEach(block -> { + BlockModels.registerCompactedBlock(modelGenerator, block); + }); + // doors List.of(UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR).forEach(modelGenerator::registerDoor); diff --git a/src/main/resources/assets/unicopia/blockstates/compacted_cloud.json b/src/main/resources/assets/unicopia/blockstates/compacted_cloud.json deleted file mode 100644 index f15401c3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/compacted_cloud.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true }, - "when": { "down": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true }, - "when": { "down": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true }, - "when": { "down": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true }, - "when": { "down": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true }, - "when": { "down": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true }, - "when": { "down": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true }, - "when": { "down": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true }, - "when": { "down": false, "north": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": false } - }, - - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_full", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_z", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_y", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_x", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_yz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xy", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": false } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/compacted_cloud_bricks.json b/src/main/resources/assets/unicopia/blockstates/compacted_cloud_bricks.json deleted file mode 100644 index 6406a516..00000000 --- a/src/main/resources/assets/unicopia/blockstates/compacted_cloud_bricks.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true }, - "when": { "down": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true }, - "when": { "down": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true }, - "when": { "down": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true }, - "when": { "down": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true }, - "when": { "down": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true }, - "when": { "down": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true }, - "when": { "down": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true }, - "when": { "down": false, "north": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": false } - }, - - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_full", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_z", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_y", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_x", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_yz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xy", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_bricks_corner_xyz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": false } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/compacted_cloud_planks.json b/src/main/resources/assets/unicopia/blockstates/compacted_cloud_planks.json deleted file mode 100644 index 676c1c31..00000000 --- a/src/main/resources/assets/unicopia/blockstates/compacted_cloud_planks.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true }, - "when": { "down": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true }, - "when": { "down": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true }, - "when": { "down": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true }, - "when": { "down": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true }, - "when": { "down": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true }, - "when": { "down": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true }, - "when": { "down": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true }, - "when": { "down": false, "north": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": false } - }, - - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_full", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_z", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_y", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_x", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_yz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xy", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_cloud_planks_corner_xyz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": false } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/compacted_dense_cloud.json b/src/main/resources/assets/unicopia/blockstates/compacted_dense_cloud.json deleted file mode 100644 index 087d05e7..00000000 --- a/src/main/resources/assets/unicopia/blockstates/compacted_dense_cloud.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true }, - "when": { "down": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true }, - "when": { "down": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true }, - "when": { "down": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true }, - "when": { "down": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true }, - "when": { "down": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true }, - "when": { "down": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true }, - "when": { "down": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true }, - "when": { "down": false, "north": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": false } - }, - - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_full", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_z", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_y", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_x", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_yz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xy", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_dense_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": false } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/compacted_etched_cloud.json b/src/main/resources/assets/unicopia/blockstates/compacted_etched_cloud.json deleted file mode 100644 index 7490f4f6..00000000 --- a/src/main/resources/assets/unicopia/blockstates/compacted_etched_cloud.json +++ /dev/null @@ -1,268 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true }, - "when": { "down": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true }, - "when": { "down": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true }, - "when": { "down": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true }, - "when": { "down": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true }, - "when": { "down": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true }, - "when": { "down": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true }, - "when": { "down": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true }, - "when": { "down": false, "north": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "y": 90 }, - "when": { "down": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "y": 90 }, - "when": { "down": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "y": 180 }, - "when": { "down": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "y": 180 }, - "when": { "down": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "y": 270 }, - "when": { "down": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "y": 270 }, - "when": { "down": false, "north": false, "west": false } - }, - - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "x": 180 }, - "when": { "up": true, "south": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "x": 180 }, - "when": { "up": false, "south": false, "east": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": true, "south": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 90 }, - "when": { "up": false, "south": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": true, "north": false, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": true, "west": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 180 }, - "when": { "up": false, "north": false, "west": false } - }, - - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_full", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_z", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_y", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_x", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": true, "north": false, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_yz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": true, "east": false } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xy", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": true } - }, - { - "apply": { "model": "unicopia:block/flattened_etched_cloud_corner_xyz", "uvlock": true, "x": 180, "y": 270 }, - "when": { "up": false, "north": false, "east": false } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_full.json deleted file mode 100644 index 15e12a24..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_full.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_full", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_x.json deleted file mode 100644 index 4797b3d6..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_x.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_x", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xy.json deleted file mode 100644 index ae763e79..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xy", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xyz.json deleted file mode 100644 index a8233437..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xyz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xyz", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xz.json deleted file mode 100644 index 74099462..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_xz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xz", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_y.json deleted file mode 100644 index 01ac9a03..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_y.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_y", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_yz.json deleted file mode 100644 index 000225a7..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_yz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_yz", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_z.json deleted file mode 100644 index 9aa4eacb..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_bricks_corner_z.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_z", - "textures": { - "all": "unicopia:block/cloud_bricks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_full.json deleted file mode 100644 index 33ef25a6..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_full.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_full", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_x.json deleted file mode 100644 index b96812a4..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_x.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_x", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xy.json deleted file mode 100644 index 04e62f64..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xy", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xyz.json deleted file mode 100644 index cead6142..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xyz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xyz", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xz.json deleted file mode 100644 index ebe260f3..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_xz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xz", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_y.json deleted file mode 100644 index 997f315c..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_y.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_y", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_yz.json deleted file mode 100644 index 3089fb62..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_yz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_yz", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_z.json deleted file mode 100644 index b60a3557..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_cloud_planks_corner_z.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_z", - "textures": { - "all": "unicopia:block/cloud_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_full.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_full.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_full.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_x.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_x.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xy.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xyz.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_xz.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_y.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_y.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_yz.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json diff --git a/src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/flattened_cloud_corner_z.json rename to src/main/resources/assets/unicopia/models/block/flattened_corner_z.json From 9db67f672761a9bcd5d56c47b1c54e49f537ce16 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 15 Mar 2024 00:57:14 +0000 Subject: [PATCH 20/44] More datagen --- .../unicopia/block/EdibleBlock.java | 2 +- .../unicopia/block/SegmentedCropBlock.java | 5 + .../datagen/providers/BlockModels.java | 134 ++++++- .../datagen/providers/ItemModels.java | 1 + .../datagen/providers/UModelProvider.java | 39 +- .../unicopia/blockstates/cloth_bed.json | 5 - .../unicopia/blockstates/cloud_bed.json | 5 - .../unicopia/blockstates/cloud_chest.json | 5 - .../blockstates/flowering_zap_leaves.json | 7 - .../unicopia/blockstates/gold_root.json | 12 - .../blockstates/golden_oak_sprout.json | 28 -- .../blockstates/green_apple_leaves.json | 11 - .../blockstates/green_apple_sprout.json | 28 -- .../unicopia/blockstates/hay_block.json | 31 -- .../assets/unicopia/blockstates/oats.json | 16 - .../unicopia/blockstates/oats_crown.json | 6 - .../unicopia/blockstates/oats_stem.json | 11 - .../unicopia/blockstates/pineapple.json | 21 -- .../unicopia/blockstates/rice_block.json | 31 -- .../blockstates/sour_apple_leaves.json | 11 - .../blockstates/sour_apple_sprout.json | 28 -- .../unicopia/blockstates/straw_block.json | 31 -- .../blockstates/sweet_apple_leaves.json | 11 - .../blockstates/sweet_apple_sprout.json | 28 -- .../unicopia/blockstates/zap_leaves.json | 19 - .../models/block/apple_sprout_stage0.json | 6 - .../models/block/apple_sprout_stage1.json | 6 - .../models/block/apple_sprout_stage2.json | 6 - .../models/block/apple_sprout_stage3.json | 6 - .../models/block/apple_sprout_stage4.json | 6 - .../models/block/apple_sprout_stage5.json | 6 - .../models/block/apple_sprout_stage6.json | 6 - .../models/block/apple_sprout_stage7.json | 6 - .../unicopia/models/block/cloth_bed.json | 5 - .../unicopia/models/block/cloud_bed.json | 5 - .../unicopia/models/block/cloud_chest.json | 5 - .../flattened_dense_cloud_corner_full.json | 6 - .../block/flattened_dense_cloud_corner_x.json | 6 - .../flattened_dense_cloud_corner_xy.json | 6 - .../flattened_dense_cloud_corner_xyz.json | 6 - .../flattened_dense_cloud_corner_xz.json | 6 - .../block/flattened_dense_cloud_corner_y.json | 6 - .../flattened_dense_cloud_corner_yz.json | 6 - .../block/flattened_dense_cloud_corner_z.json | 6 - .../flattened_etched_cloud_corner_full.json | 6 - .../flattened_etched_cloud_corner_x.json | 6 - .../flattened_etched_cloud_corner_xy.json | 6 - .../flattened_etched_cloud_corner_xyz.json | 6 - .../flattened_etched_cloud_corner_xz.json | 6 - .../flattened_etched_cloud_corner_y.json | 6 - .../flattened_etched_cloud_corner_yz.json | 6 - .../flattened_etched_cloud_corner_z.json | 6 - .../models/block/flowering_zap_leaves.json | 6 - .../models/block/gold_root_stage0.json | 6 - .../models/block/gold_root_stage1.json | 6 - .../models/block/gold_root_stage2.json | 6 - .../models/block/gold_root_stage3.json | 6 - .../models/block/green_apple_leaves.json | 6 - .../block/green_apple_leaves_flowering.json | 6 - .../unicopia/models/block/oats_stage0.json | 6 - .../unicopia/models/block/oats_stage1.json | 6 - .../models/block/oats_stage10_lower.json | 6 - .../models/block/oats_stage10_mid.json | 6 - .../models/block/oats_stage10_upper.json | 6 - .../models/block/oats_stage11_lower.json | 6 - .../models/block/oats_stage11_mid.json | 6 - .../models/block/oats_stage11_upper.json | 6 - .../unicopia/models/block/oats_stage2.json | 6 - .../unicopia/models/block/oats_stage3.json | 6 - .../unicopia/models/block/oats_stage4.json | 6 - .../models/block/oats_stage5_lower.json | 6 - .../models/block/oats_stage5_upper.json | 6 - .../models/block/oats_stage6_lower.json | 6 - .../models/block/oats_stage6_upper.json | 6 - .../models/block/oats_stage7_lower.json | 6 - .../models/block/oats_stage7_upper.json | 6 - .../models/block/oats_stage8_lower.json | 6 - .../models/block/oats_stage8_upper.json | 6 - .../models/block/oats_stage9_lower.json | 6 - .../models/block/oats_stage9_upper.json | 6 - .../unicopia/models/block/pineapple.json | 350 ------------------ .../models/block/pineapple_stage0.json | 6 - .../models/block/pineapple_stage1.json | 6 - .../models/block/pineapple_stage2.json | 6 - .../models/block/pineapple_stage3.json | 6 - .../models/block/pineapple_stage4.json | 6 - .../models/block/pineapple_stage5.json | 6 - .../models/block/pineapple_stage6.json | 6 - .../models/block/pineapple_stem_stage0.json | 6 - .../models/block/pineapple_stem_stage1.json | 6 - .../models/block/pineapple_stem_stage2.json | 6 - .../models/block/pineapple_stem_stage3.json | 6 - .../models/block/pineapple_stem_stage4.json | 6 - .../models/block/pineapple_stem_stage5.json | 6 - .../models/block/pineapple_stem_stage6.json | 6 - .../unicopia/models/block/rice_bale_bne.json | 8 - .../unicopia/models/block/rice_bale_bnw.json | 8 - .../unicopia/models/block/rice_bale_bse.json | 8 - .../unicopia/models/block/rice_bale_bsw.json | 8 - .../unicopia/models/block/rice_bale_tne.json | 8 - .../unicopia/models/block/rice_bale_tnw.json | 8 - .../unicopia/models/block/rice_bale_tse.json | 8 - .../unicopia/models/block/rice_bale_tsw.json | 8 - .../models/block/sour_apple_leaves.json | 6 - .../block/sour_apple_leaves_flowering.json | 6 - .../unicopia/models/block/straw_bale_bne.json | 8 - .../unicopia/models/block/straw_bale_bnw.json | 8 - .../unicopia/models/block/straw_bale_bse.json | 8 - .../unicopia/models/block/straw_bale_bsw.json | 8 - .../unicopia/models/block/straw_bale_tne.json | 8 - .../unicopia/models/block/straw_bale_tnw.json | 8 - .../unicopia/models/block/straw_bale_tse.json | 8 - .../unicopia/models/block/straw_bale_tsw.json | 8 - .../models/block/sweet_apple_leaves.json | 6 - .../block/sweet_apple_leaves_flowering.json | 6 - ...y_bale_bne.json => template_bale_bne.json} | 0 ...y_bale_bnw.json => template_bale_bnw.json} | 0 ...y_bale_bse.json => template_bale_bse.json} | 0 ...y_bale_bsw.json => template_bale_bsw.json} | 0 ...y_bale_tne.json => template_bale_tne.json} | 0 ...y_bale_tnw.json => template_bale_tnw.json} | 0 ...y_bale_tse.json => template_bale_tse.json} | 0 ...y_bale_tsw.json => template_bale_tsw.json} | 0 .../unicopia/models/block/zap_leaves.json | 6 - .../unicopia/models/item/cloth_bed.json | 6 - .../unicopia/models/item/cloud_bed.json | 6 - .../unicopia/models/item/cloud_chest.json | 6 - .../models/item/flowering_zap_leaves.json | 3 - .../models/item/green_apple_leaves.json | 3 - .../models/item/sour_apple_leaves.json | 3 - .../models/item/sweet_apple_leaves.json | 3 - .../unicopia/models/item/zap_leaves.json | 3 - ...tage10_upper.png => oats_crown_stage0.png} | Bin ...tage11_upper.png => oats_crown_stage1.png} | Bin ...ats_stage10_lower.png => oats_stage10.png} | Bin ...ats_stage11_lower.png => oats_stage11.png} | Bin ...{oats_stage5_lower.png => oats_stage5.png} | Bin ...{oats_stage6_lower.png => oats_stage6.png} | Bin ...{oats_stage7_lower.png => oats_stage7.png} | Bin ...{oats_stage8_lower.png => oats_stage8.png} | Bin ...{oats_stage9_lower.png => oats_stage9.png} | Bin ..._stage5_upper.png => oats_stem_stage0.png} | Bin ..._stage6_upper.png => oats_stem_stage1.png} | Bin ..._stage7_upper.png => oats_stem_stage2.png} | Bin ..._stage8_upper.png => oats_stem_stage3.png} | Bin ..._stage9_upper.png => oats_stem_stage4.png} | Bin ...s_stage10_mid.png => oats_stem_stage5.png} | Bin ...s_stage11_mid.png => oats_stem_stage6.png} | Bin ...stage0.png => pineapple_bottom_stage0.png} | Bin ...stage1.png => pineapple_bottom_stage1.png} | Bin ...stage2.png => pineapple_bottom_stage2.png} | Bin ...stage3.png => pineapple_bottom_stage3.png} | Bin ...stage4.png => pineapple_bottom_stage4.png} | Bin ...stage5.png => pineapple_bottom_stage5.png} | Bin ...stage6.png => pineapple_bottom_stage6.png} | Bin ...le_stage0.png => pineapple_top_stage0.png} | Bin ...le_stage1.png => pineapple_top_stage1.png} | Bin ...le_stage2.png => pineapple_top_stage2.png} | Bin ...le_stage3.png => pineapple_top_stage3.png} | Bin ...le_stage4.png => pineapple_top_stage4.png} | Bin ...le_stage5.png => pineapple_top_stage5.png} | Bin ...le_stage6.png => pineapple_top_stage6.png} | Bin .../fall/oats_crown_stage0.png} | Bin .../fall/oats_crown_stage1.png} | Bin .../fall/oats_stage0.png} | Bin .../fall/oats_stage1.png} | Bin .../fall/oats_stage10.png} | Bin .../fall/oats_stage11.png} | Bin .../fall/oats_stage2.png} | Bin .../fall/oats_stage3.png} | Bin .../fall/oats_stage4.png} | Bin .../fall/oats_stage5.png} | Bin .../fall/oats_stage6.png} | Bin .../fall/oats_stage7.png} | Bin .../fall/oats_stage8.png} | Bin .../fall/oats_stage9.png} | Bin .../fall/oats_stem_stage0.png} | Bin .../fall/oats_stem_stage1.png} | Bin .../fall/oats_stem_stage2.png} | Bin .../fall/oats_stem_stage3.png} | Bin .../fall/oats_stem_stage4.png} | Bin .../fall/oats_stem_stage5.png} | Bin .../fall/oats_stem_stage6.png} | Bin .../summer/oats_crown_stage0.png} | Bin .../summer/oats_crown_stage1.png} | Bin .../summer/oats_stage0.png} | Bin .../summer/oats_stage1.png} | Bin .../summer/oats_stage10.png} | Bin .../summer/oats_stage11.png} | Bin .../summer/oats_stage2.png} | Bin .../summer/oats_stage3.png} | Bin .../summer/oats_stage4.png} | Bin .../summer/oats_stage5.png} | Bin .../summer/oats_stage6.png} | Bin .../summer/oats_stage7.png} | Bin .../summer/oats_stage8.png} | Bin .../summer/oats_stage9.png} | Bin .../summer/oats_stem_stage0.png} | Bin .../summer/oats_stem_stage1.png} | Bin .../summer/oats_stem_stage2.png} | Bin .../summer/oats_stem_stage3.png} | Bin .../summer/oats_stem_stage4.png} | Bin .../summer/oats_stem_stage5.png} | Bin .../summer/oats_stem_stage6.png} | Bin .../winter/oats_crown_stage0.png} | Bin .../winter/oats_crown_stage1.png} | Bin .../winter/oats_stage0.png} | Bin .../winter/oats_stage1.png} | Bin .../winter/oats_stage10.png} | Bin .../winter/oats_stage11.png} | Bin .../winter/oats_stage2.png} | Bin .../winter/oats_stage3.png} | Bin .../winter/oats_stage4.png} | Bin .../winter/oats_stage5.png} | Bin .../winter/oats_stage6.png} | Bin .../winter/oats_stage7.png} | Bin .../winter/oats_stage8.png} | Bin .../winter/oats_stage9.png} | Bin .../winter/oats_stem_stage0.png} | Bin .../winter/oats_stem_stage1.png} | Bin .../winter/oats_stem_stage2.png} | Bin .../winter/oats_stem_stage3.png} | Bin .../winter/oats_stem_stage4.png} | Bin .../winter/oats_stem_stage5.png} | Bin .../winter/oats_stem_stage6.png} | Bin 225 files changed, 169 insertions(+), 1309 deletions(-) delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloth_bed.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_bed.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_chest.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/flowering_zap_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/gold_root.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/golden_oak_sprout.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/green_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/hay_block.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/oats.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/oats_crown.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/oats_stem.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/pineapple.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/rice_block.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sour_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sour_apple_sprout.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/straw_block.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloth_bed.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_bed.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_chest.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_full.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_x.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xy.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xyz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_y.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_yz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_z.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_full.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_x.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xy.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xyz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_y.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_yz.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_z.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flowering_zap_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/gold_root_stage0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/gold_root_stage1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/gold_root_stage2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/gold_root_stage3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/green_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/green_apple_leaves_flowering.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage10_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage10_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage11_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage11_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage4.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage5_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage5_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage6_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage6_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage7_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage7_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage8_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage8_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage9_lower.json delete mode 100644 src/main/resources/assets/unicopia/models/block/oats_stage9_upper.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage4.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage5.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stage6.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage4.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage5.json delete mode 100644 src/main/resources/assets/unicopia/models/block/pineapple_stem_stage6.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_bne.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_bnw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_bse.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_bsw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_tne.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_tnw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_tse.json delete mode 100644 src/main/resources/assets/unicopia/models/block/rice_bale_tsw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sour_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sour_apple_leaves_flowering.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_bne.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_bnw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_bse.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_bsw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_tne.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_tnw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_tse.json delete mode 100644 src/main/resources/assets/unicopia/models/block/straw_bale_tsw.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/block/sweet_apple_leaves_flowering.json rename src/main/resources/assets/unicopia/models/block/{hay_bale_bne.json => template_bale_bne.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_bnw.json => template_bale_bnw.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_bse.json => template_bale_bse.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_bsw.json => template_bale_bsw.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_tne.json => template_bale_tne.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_tnw.json => template_bale_tnw.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_tse.json => template_bale_tse.json} (100%) rename src/main/resources/assets/unicopia/models/block/{hay_bale_tsw.json => template_bale_tsw.json} (100%) delete mode 100644 src/main/resources/assets/unicopia/models/block/zap_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloth_bed.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_bed.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_chest.json delete mode 100644 src/main/resources/assets/unicopia/models/item/flowering_zap_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/green_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sour_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_leaves.json rename src/main/resources/assets/unicopia/textures/block/{oats_stage10_upper.png => oats_crown_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage11_upper.png => oats_crown_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage10_lower.png => oats_stage10.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage11_lower.png => oats_stage11.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage5_lower.png => oats_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage6_lower.png => oats_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage7_lower.png => oats_stage7.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage8_lower.png => oats_stage8.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage9_lower.png => oats_stage9.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage5_upper.png => oats_stem_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage6_upper.png => oats_stem_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage7_upper.png => oats_stem_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage8_upper.png => oats_stem_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage9_upper.png => oats_stem_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage10_mid.png => oats_stem_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{oats_stage11_mid.png => oats_stem_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage0.png => pineapple_bottom_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage1.png => pineapple_bottom_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage2.png => pineapple_bottom_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage3.png => pineapple_bottom_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage4.png => pineapple_bottom_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage5.png => pineapple_bottom_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stem_stage6.png => pineapple_bottom_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage0.png => pineapple_top_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage1.png => pineapple_top_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage2.png => pineapple_top_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage3.png => pineapple_top_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage4.png => pineapple_top_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage5.png => pineapple_top_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{pineapple_stage6.png => pineapple_top_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage10_upper.png => seasons/fall/oats_crown_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage11_upper.png => seasons/fall/oats_crown_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage0.png => seasons/fall/oats_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage1.png => seasons/fall/oats_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage10_lower.png => seasons/fall/oats_stage10.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage11_lower.png => seasons/fall/oats_stage11.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage2.png => seasons/fall/oats_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage3.png => seasons/fall/oats_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage4.png => seasons/fall/oats_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage5_lower.png => seasons/fall/oats_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage6_lower.png => seasons/fall/oats_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage7_lower.png => seasons/fall/oats_stage7.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage8_lower.png => seasons/fall/oats_stage8.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage9_lower.png => seasons/fall/oats_stage9.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage5_upper.png => seasons/fall/oats_stem_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage6_upper.png => seasons/fall/oats_stem_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage7_upper.png => seasons/fall/oats_stem_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage8_upper.png => seasons/fall/oats_stem_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage9_upper.png => seasons/fall/oats_stem_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage10_mid.png => seasons/fall/oats_stem_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{fall_oats_stage11_mid.png => seasons/fall/oats_stem_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage10_upper.png => seasons/summer/oats_crown_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage11_upper.png => seasons/summer/oats_crown_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage0.png => seasons/summer/oats_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage1.png => seasons/summer/oats_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage10_lower.png => seasons/summer/oats_stage10.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage11_lower.png => seasons/summer/oats_stage11.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage2.png => seasons/summer/oats_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage3.png => seasons/summer/oats_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage4.png => seasons/summer/oats_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage5_lower.png => seasons/summer/oats_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage6_lower.png => seasons/summer/oats_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage7_lower.png => seasons/summer/oats_stage7.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage8_lower.png => seasons/summer/oats_stage8.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage9_lower.png => seasons/summer/oats_stage9.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage5_upper.png => seasons/summer/oats_stem_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage6_upper.png => seasons/summer/oats_stem_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage7_upper.png => seasons/summer/oats_stem_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage8_upper.png => seasons/summer/oats_stem_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage9_upper.png => seasons/summer/oats_stem_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage10_mid.png => seasons/summer/oats_stem_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{summer_oats_stage11_mid.png => seasons/summer/oats_stem_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage10_upper.png => seasons/winter/oats_crown_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage11_upper.png => seasons/winter/oats_crown_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage0.png => seasons/winter/oats_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage1.png => seasons/winter/oats_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage10_lower.png => seasons/winter/oats_stage10.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage11_lower.png => seasons/winter/oats_stage11.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage2.png => seasons/winter/oats_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage3.png => seasons/winter/oats_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage4.png => seasons/winter/oats_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage5_lower.png => seasons/winter/oats_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage6_lower.png => seasons/winter/oats_stage6.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage7_lower.png => seasons/winter/oats_stage7.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage8_lower.png => seasons/winter/oats_stage8.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage9_lower.png => seasons/winter/oats_stage9.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage5_upper.png => seasons/winter/oats_stem_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage6_upper.png => seasons/winter/oats_stem_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage7_upper.png => seasons/winter/oats_stem_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage8_upper.png => seasons/winter/oats_stem_stage3.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage9_upper.png => seasons/winter/oats_stem_stage4.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage10_mid.png => seasons/winter/oats_stem_stage5.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{winter_oats_stage11_mid.png => seasons/winter/oats_stem_stage6.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/block/EdibleBlock.java b/src/main/java/com/minelittlepony/unicopia/block/EdibleBlock.java index b450c828..e6bf0482 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/EdibleBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/EdibleBlock.java @@ -50,7 +50,7 @@ public class EdibleBlock extends HayBlock { static final BooleanProperty BOTTOM_SOUTH_WEST = BooleanProperty.of("bottom_south_west"); // [up/down][north/south][west/east] - private static final BooleanProperty[] SEGMENTS = { + public static final BooleanProperty[] SEGMENTS = { BOTTOM_NORTH_WEST, BOTTOM_NORTH_EAST, BOTTOM_SOUTH_WEST, diff --git a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java index 72cb168d..25f3539c 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java @@ -65,6 +65,11 @@ public class SegmentedCropBlock extends CropBlock implements SegmentedBlock { this.progressionAge = progressionAge; } + @Override + public IntProperty getAgeProperty() { + return super.getAgeProperty(); + } + public SegmentedCropBlock createNext(int progressionAge) { SegmentedCropBlock next = create(getMaxAge() - this.progressionAge, progressionAge, Settings.copy(this), seeds, () -> this, null); nextSegmentSupplier = () -> next; diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java index 46285665..7473ebd2 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -1,23 +1,44 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.Arrays; -import java.util.List; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; +import java.util.stream.Stream; + import com.minelittlepony.unicopia.Unicopia; +import com.minelittlepony.unicopia.block.EdibleBlock; +import com.minelittlepony.unicopia.block.FruitBearingBlock; +import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; +import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; + +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.BlockStateSupplier; import net.minecraft.data.client.BlockStateVariant; +import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.Model; import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.Models; import net.minecraft.data.client.MultipartBlockStateSupplier; import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; +import net.minecraft.data.client.TexturedModel; import net.minecraft.data.client.VariantSettings; +import net.minecraft.data.client.VariantsBlockStateSupplier; import net.minecraft.data.client.When; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.StringIdentifiable; +import net.minecraft.util.math.Direction; public interface BlockModels { Model FRUIT = block("fruit", TextureKey.CROSS); @@ -29,10 +50,13 @@ public interface BlockModels { VariantSettings.Rotation.R270, VariantSettings.Rotation.R180, VariantSettings.Rotation.R0, VariantSettings.Rotation.R90 }; - List FLATTENED_MODELS = Arrays.stream(FLATTENED_MODEL_SUFFEXES) - .map(suffex -> "_corner_" + suffex) - .map(variant -> block("flattened" + variant, variant, TextureKey.ALL)) - .toList(); + Model[] FLATTENED_MODELS = Arrays.stream(FLATTENED_MODEL_SUFFEXES) + .map(variant -> block("flattened_corner_" + variant, "_corner_" + variant, TextureKey.ALL)) + .toArray(Model[]::new); + @SuppressWarnings("unchecked") + Pair[] BALE_MODELS = Stream.of("bnw", "bne", "bsw", "bse", "tnw", "tne", "tsw", "tse") + .map(suffex -> new Pair<>(block("template_bale_" + suffex, "_" + suffex, TextureKey.TOP, TextureKey.SIDE), "_" + suffex)) + .toArray(Pair[]::new); static Model block(String parent, TextureKey ... requiredTextureKeys) { return new Model(Optional.of(Unicopia.id("block/" + parent)), Optional.empty(), requiredTextureKeys); @@ -46,14 +70,18 @@ public interface BlockModels { return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.empty(), requiredTextureKeys); } + static Model block(Identifier parent, String variant, TextureKey ... requiredTextureKeys) { + return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.of(variant), requiredTextureKeys); + } + static void registerCompactedBlock(BlockStateModelGenerator modelGenerator, Block block) { - FLATTENED_MODELS.forEach(model -> { + for (Model model : FLATTENED_MODELS) { model.upload(block, TextureMap.all(ModelIds.getBlockModelId(block).withPath(p -> p.replace("compacted_", ""))), modelGenerator.modelCollector); - }); + } modelGenerator.blockStateCollector.accept(createCompactedBlockState(block)); } - static BlockStateSupplier createCompactedBlockState(Block block) { + private static BlockStateSupplier createCompactedBlockState(Block block) { MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(block); for (byte i = 0; i < FLATTENED_MODEL_ROTATIONS.length; i++) { final BooleanProperty yAxis = (i & 0b100) == 0 ? Properties.DOWN : Properties.UP; @@ -76,4 +104,94 @@ public interface BlockModels { } return supplier; } + + static void registerChest(BlockStateModelGenerator modelGenerator, Block chest, Block particleSource) { + modelGenerator.registerBuiltin(ModelIds.getBlockModelId(chest), particleSource).includeWithoutItem(chest); + ItemModels.CHEST.upload(ModelIds.getItemModelId(chest.asItem()), TextureMap.particle(particleSource), modelGenerator.modelCollector); + } + + static void registerBed(BlockStateModelGenerator modelGenerator, Block bed, Block particleSource) { + modelGenerator.registerBuiltinWithParticle(bed, ModelIds.getBlockModelId(particleSource)); + modelGenerator.registerBed(bed, particleSource); + } + + static void registerBale(BlockStateModelGenerator modelGenerator, Identifier blockId, Identifier baseBlockId, String endSuffex) { + Identifier top = baseBlockId.withPath(p -> "block/" + p + endSuffex); + Identifier side = baseBlockId.withPath(p -> "block/" + p + "_side"); + TextureMap textures = new TextureMap().put(TextureKey.TOP, top).put(TextureKey.SIDE, side); + + MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(Registries.BLOCK.getOrEmpty(blockId).orElseGet(() -> { + return Registry.register(Registries.BLOCK, blockId, new EdibleBlock(blockId, blockId, false)); + })); + Map uploadedModels = new HashMap<>(); + + for (Direction.Axis axis : Direction.Axis.VALUES) { + for (int i = 0; i < EdibleBlock.SEGMENTS.length; i++) { + BooleanProperty segment = EdibleBlock.SEGMENTS[i]; + segment.getName(); + supplier.with(When.create().set(EdibleBlock.AXIS, axis).set(segment, true), BlockStateVariant.create() + .put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(i, ii -> { + return BALE_MODELS[ii].getLeft().upload(blockId.withPath(p -> "block/" + p + BALE_MODELS[ii].getRight()), textures, modelGenerator.modelCollector); + })) + .put(VariantSettings.X, axis == Direction.Axis.Y ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R90) + .put(VariantSettings.Y, axis == Direction.Axis.X ? VariantSettings.Rotation.R90 : VariantSettings.Rotation.R0) + ); + } + } + + modelGenerator.blockStateCollector.accept(supplier); + } + + static void registerCropWithoutItem(BlockStateModelGenerator modelGenerator, Block crop, Property ageProperty, int ... stages) { + if (ageProperty.getValues().size() != stages.length) { + throw new IllegalArgumentException(); + } + Int2ObjectOpenHashMap uploadedModels = new Int2ObjectOpenHashMap<>(); + modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(ageProperty).register(integer -> { + Identifier identifier = uploadedModels.computeIfAbsent(stages[integer], stage -> modelGenerator.createSubModel(crop, "_stage" + stage, Models.CROP, TextureMap::crop)); + return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); + }))); + } + + static & StringIdentifiable> void registerTallCrop(BlockStateModelGenerator modelGenerator, Block crop, + Property ageProperty, + EnumProperty partProperty, + int[] ... ageTextureIndices) { + Map uploadedModels = new HashMap<>(); + modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(partProperty, ageProperty).register((part, age) -> { + int i = ageTextureIndices[part.ordinal()][age]; + Identifier identifier = uploadedModels.computeIfAbsent("_" + part.asString() + "_stage" + i, variant -> modelGenerator.createSubModel(crop, variant, Models.CROSS, TextureMap::cross)); + return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); + }))); + } + + static void registerFloweringLeaves(BlockStateModelGenerator modelGenerator, Block block) { + Identifier baseModel = TexturedModel.LEAVES.upload(block, modelGenerator.modelCollector); + Identifier floweringModel = Models.CUBE_ALL.upload(block, "_flowering", TextureMap.of(TextureKey.ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelGenerator.modelCollector); + modelGenerator.blockStateCollector.accept(MultipartBlockStateSupplier.create(block) + .with(BlockStateVariant.create().put(VariantSettings.MODEL, baseModel)) + .with(When.create().set(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.FLOWERING), BlockStateVariant.create().put(VariantSettings.MODEL, floweringModel))); + } + + static void registerZapLeaves(BlockStateModelGenerator modelGenerator, Block block) { + Identifier baseModel = TexturedModel.LEAVES.upload(block, modelGenerator.modelCollector); + Identifier floweringModel = Registries.BLOCK.getId(block).withPrefixedPath("block/flowering_"); + modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(block) + .coordinate(BlockStateVariantMap.create(ZapAppleLeavesBlock.STAGE) + .register(stage -> BlockStateVariant.create() + .put(VariantSettings.MODEL, stage == ZapAppleStageStore.Stage.FLOWERING ? floweringModel : baseModel)))); + } + + static void createSproutStages(BlockStateModelGenerator modelGenerator) { + for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { + Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelGenerator.modelCollector); + } + } + + static void registerSprout(BlockStateModelGenerator modelGenerator, Block block) { + modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(block) + .coordinate(BlockStateVariantMap.create(Properties.AGE_7) + .register(age -> BlockStateVariant.create() + .put(VariantSettings.MODEL, Unicopia.id("block/apple_sprout_stage" + age))))); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java index 5e14ad9b..37c260f0 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java @@ -18,6 +18,7 @@ import net.minecraft.util.Identifier; interface ItemModels { Model GENERATED = net.minecraft.data.client.Models.GENERATED; + Model CHEST = item(new Identifier("chest"), TextureKey.PARTICLE); Model TEMPLATE_AMULET = item("template_amulet", TextureKey.LAYER0); Model TEMPLATE_SPAWN_EGG = item(new Identifier("template_spawn_egg")); Model TEMPLATE_MUG = item("template_mug", TextureKey.LAYER0); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 11df3b3a..03bc4d22 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.minelittlepony.unicopia.Race; +import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; @@ -11,17 +12,21 @@ import com.minelittlepony.unicopia.server.world.Tree; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.BlockStateModelGenerator.TintType; import net.minecraft.data.family.BlockFamily; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.registry.Registries; +import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.ModelIds; import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; +import net.minecraft.data.client.TexturedModel; public class UModelProvider extends FabricModelProvider { public UModelProvider(FabricDataOutput output) { @@ -30,7 +35,6 @@ public class UModelProvider extends FabricModelProvider { @Override public void generateBlockStateModels(BlockStateModelGenerator modelGenerator) { - // cloud blocks modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD).slab(UBlocks.CLOUD_SLAB);//.stairs(UBlocks.CLOUD_STAIRS); modelGenerator.registerCubeAllModelTexturePool(UBlocks.ETCHED_CLOUD).slab(UBlocks.ETCHED_CLOUD_SLAB);//.stairs(UBlocks.ETCHED_CLOUD_STAIRS); @@ -41,6 +45,9 @@ public class UModelProvider extends FabricModelProvider { List.of(UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_DENSE_CLOUD, UBlocks.COMPACTED_ETCHED_CLOUD).forEach(block -> { BlockModels.registerCompactedBlock(modelGenerator, block); }); + BlockModels.registerChest(modelGenerator, UBlocks.CLOUD_CHEST, UBlocks.CLOUD); + BlockModels.registerBed(modelGenerator, UBlocks.CLOUD_BED, UBlocks.CLOUD); + BlockModels.registerBed(modelGenerator, UBlocks.CLOTH_BED, Blocks.SPRUCE_PLANKS); // doors List.of(UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR).forEach(modelGenerator::registerDoor); @@ -76,19 +83,36 @@ public class UModelProvider extends FabricModelProvider { .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) .group("wooden").unlockCriterionName("has_planks") .build()); + BlockModels.registerZapLeaves(modelGenerator, UBlocks.ZAP_LEAVES); + modelGenerator.registerSingleton(UBlocks.FLOWERING_ZAP_LEAVES, TexturedModel.LEAVES); // golden oak wood modelGenerator.registerSimpleCubeAll(UBlocks.GOLDEN_OAK_LEAVES); modelGenerator.registerLog(UBlocks.GOLDEN_OAK_LOG) .log(UBlocks.GOLDEN_OAK_LOG); - - // plants Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> { modelGenerator.registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED); }); modelGenerator.registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); + modelGenerator.registerCrop(UBlocks.GOLD_ROOT, Properties.AGE_7, 0, 0, 1, 1, 2, 2, 2, 3); + BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS, UBlocks.OATS.getAgeProperty(), 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), 0, 1, 2, 3, 4, 5, 6); + BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), 0, 1); + BlockModels.registerTallCrop(modelGenerator, UBlocks.PINEAPPLE, Properties.AGE_7, Properties.BLOCK_HALF, + new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, + new int[] { 0, 0, 1, 2, 3, 4, 5, 6 } + ); + + // leaves + List.of(UBlocks.GREEN_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES).forEach(block -> { + BlockModels.registerFloweringLeaves(modelGenerator, block); + }); + BlockModels.createSproutStages(modelGenerator); + List.of(UBlocks.GREEN_APPLE_SPROUT, UBlocks.SOUR_APPLE_SPROUT, UBlocks.SWEET_APPLE_SPROUT, UBlocks.GOLDEN_OAK_SPROUT).forEach(block -> { + BlockModels.registerSprout(modelGenerator, block); + }); // fruit Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, @@ -101,6 +125,15 @@ public class UModelProvider extends FabricModelProvider { ).forEach((block, item) -> { modelGenerator.registerSingleton(block, TextureMap.cross(Registries.ITEM.getId(item).withPrefixedPath("item/")), BlockModels.FRUIT); }); + + // bales + List.of( + new Pair<>(new Identifier("hay_block"), "_top"), + new Pair<>(new Identifier("farmersdelight", "rice_bale"), "_top"), + new Pair<>(new Identifier("farmersdelight", "straw_bale"), "_end") + ).forEach(block -> { + BlockModels.registerBale(modelGenerator, Unicopia.id(block.getLeft().getPath().replace("bale", "block")), block.getLeft(), block.getRight()); + }); } @Override diff --git a/src/main/resources/assets/unicopia/blockstates/cloth_bed.json b/src/main/resources/assets/unicopia/blockstates/cloth_bed.json deleted file mode 100644 index a86c636b..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloth_bed.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloth_bed" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_bed.json b/src/main/resources/assets/unicopia/blockstates/cloud_bed.json deleted file mode 100644 index 691e8653..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_bed.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud_bed" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_chest.json b/src/main/resources/assets/unicopia/blockstates/cloud_chest.json deleted file mode 100644 index aa6b3edb..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud_chest" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/flowering_zap_leaves.json b/src/main/resources/assets/unicopia/blockstates/flowering_zap_leaves.json deleted file mode 100644 index 8122824c..00000000 --- a/src/main/resources/assets/unicopia/blockstates/flowering_zap_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/flowering_zap_leaves" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/gold_root.json b/src/main/resources/assets/unicopia/blockstates/gold_root.json deleted file mode 100644 index 6791a03a..00000000 --- a/src/main/resources/assets/unicopia/blockstates/gold_root.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "age=0": { "model": "unicopia:block/gold_root_stage0" }, - "age=1": { "model": "unicopia:block/gold_root_stage0" }, - "age=2": { "model": "unicopia:block/gold_root_stage1" }, - "age=3": { "model": "unicopia:block/gold_root_stage1" }, - "age=4": { "model": "unicopia:block/gold_root_stage2" }, - "age=5": { "model": "unicopia:block/gold_root_stage2" }, - "age=6": { "model": "unicopia:block/gold_root_stage2" }, - "age=7": { "model": "unicopia:block/gold_root_stage3" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/golden_oak_sprout.json b/src/main/resources/assets/unicopia/blockstates/golden_oak_sprout.json deleted file mode 100644 index f88ff7ea..00000000 --- a/src/main/resources/assets/unicopia/blockstates/golden_oak_sprout.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/apple_sprout_stage0" - }, - "age=1": { - "model": "unicopia:block/apple_sprout_stage1" - }, - "age=2": { - "model": "unicopia:block/apple_sprout_stage2" - }, - "age=3": { - "model": "unicopia:block/apple_sprout_stage3" - }, - "age=4": { - "model": "unicopia:block/apple_sprout_stage4" - }, - "age=5": { - "model": "unicopia:block/apple_sprout_stage5" - }, - "age=6": { - "model": "unicopia:block/apple_sprout_stage6" - }, - "age=7": { - "model": "unicopia:block/apple_sprout_stage7" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/green_apple_leaves.json b/src/main/resources/assets/unicopia/blockstates/green_apple_leaves.json deleted file mode 100644 index 79c8b6a4..00000000 --- a/src/main/resources/assets/unicopia/blockstates/green_apple_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/green_apple_leaves" } - }, - { - "apply": { "model": "unicopia:block/green_apple_leaves_flowering" }, - "when": { "stage": "flowering" } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json b/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json deleted file mode 100644 index f88ff7ea..00000000 --- a/src/main/resources/assets/unicopia/blockstates/green_apple_sprout.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/apple_sprout_stage0" - }, - "age=1": { - "model": "unicopia:block/apple_sprout_stage1" - }, - "age=2": { - "model": "unicopia:block/apple_sprout_stage2" - }, - "age=3": { - "model": "unicopia:block/apple_sprout_stage3" - }, - "age=4": { - "model": "unicopia:block/apple_sprout_stage4" - }, - "age=5": { - "model": "unicopia:block/apple_sprout_stage5" - }, - "age=6": { - "model": "unicopia:block/apple_sprout_stage6" - }, - "age=7": { - "model": "unicopia:block/apple_sprout_stage7" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/hay_block.json b/src/main/resources/assets/unicopia/blockstates/hay_block.json deleted file mode 100644 index 1378545e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/hay_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unicopia:block/hay_bale_bne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_east": true } }, - - { "apply": { "model": "unicopia:block/hay_bale_bne" }, "when": { "axis": "y", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bnw" }, "when": { "axis": "y", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bse" }, "when": { "axis": "y", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bsw" }, "when": { "axis": "y", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tne" }, "when": { "axis": "y", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tnw" }, "when": { "axis": "y", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tse" }, "when": { "axis": "y", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tsw" }, "when": { "axis": "y", "top_south_west": true } }, - - - { "apply": { "model": "unicopia:block/hay_bale_bne", "x": 90 }, "when": { "axis": "z", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bnw", "x": 90 }, "when": { "axis": "z", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bse", "x": 90 }, "when": { "axis": "z", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_bsw", "x": 90 }, "when": { "axis": "z", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tne", "x": 90 }, "when": { "axis": "z", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tnw", "x": 90 }, "when": { "axis": "z", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tse", "x": 90 }, "when": { "axis": "z", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/hay_bale_tsw", "x": 90 }, "when": { "axis": "z", "top_north_west": true } } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/oats.json b/src/main/resources/assets/unicopia/blockstates/oats.json deleted file mode 100644 index 109760e1..00000000 --- a/src/main/resources/assets/unicopia/blockstates/oats.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "age=0": { "model": "unicopia:block/oats_stage0" }, - "age=1": { "model": "unicopia:block/oats_stage1" }, - "age=2": { "model": "unicopia:block/oats_stage2" }, - "age=3": { "model": "unicopia:block/oats_stage3" }, - "age=4": { "model": "unicopia:block/oats_stage4" }, - "age=5": { "model": "unicopia:block/oats_stage5_lower" }, - "age=6": { "model": "unicopia:block/oats_stage6_lower" }, - "age=7": { "model": "unicopia:block/oats_stage7_lower" }, - "age=8": { "model": "unicopia:block/oats_stage8_lower" }, - "age=9": { "model": "unicopia:block/oats_stage9_lower" }, - "age=10": { "model": "unicopia:block/oats_stage10_lower" }, - "age=11": { "model": "unicopia:block/oats_stage11_lower" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/oats_crown.json b/src/main/resources/assets/unicopia/blockstates/oats_crown.json deleted file mode 100644 index 1f75a155..00000000 --- a/src/main/resources/assets/unicopia/blockstates/oats_crown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "age=0": { "model": "unicopia:block/oats_stage10_upper" }, - "age=1": { "model": "unicopia:block/oats_stage11_upper" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/oats_stem.json b/src/main/resources/assets/unicopia/blockstates/oats_stem.json deleted file mode 100644 index dac01154..00000000 --- a/src/main/resources/assets/unicopia/blockstates/oats_stem.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "variants": { - "age=0": { "model": "unicopia:block/oats_stage5_upper" }, - "age=1": { "model": "unicopia:block/oats_stage6_upper" }, - "age=2": { "model": "unicopia:block/oats_stage7_upper" }, - "age=3": { "model": "unicopia:block/oats_stage8_upper" }, - "age=4": { "model": "unicopia:block/oats_stage9_upper" }, - "age=5": { "model": "unicopia:block/oats_stage10_mid" }, - "age=6": { "model": "unicopia:block/oats_stage11_mid" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/pineapple.json b/src/main/resources/assets/unicopia/blockstates/pineapple.json deleted file mode 100644 index 976377d8..00000000 --- a/src/main/resources/assets/unicopia/blockstates/pineapple.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "variants": { - "age=0,half=bottom": { "model": "unicopia:block/pineapple_stem_stage0" }, - "age=1,half=bottom": { "model": "unicopia:block/pineapple_stem_stage1" }, - "age=2,half=bottom": { "model": "unicopia:block/pineapple_stem_stage2" }, - "age=3,half=bottom": { "model": "unicopia:block/pineapple_stem_stage3" }, - "age=4,half=bottom": { "model": "unicopia:block/pineapple_stem_stage4" }, - "age=5,half=bottom": { "model": "unicopia:block/pineapple_stem_stage5" }, - "age=6,half=bottom": { "model": "unicopia:block/pineapple_stem_stage5" }, - "age=7,half=bottom": { "model": "unicopia:block/pineapple_stem_stage6" }, - - "age=0,half=top": { "model": "unicopia:block/pineapple_stage0" }, - "age=1,half=top": { "model": "unicopia:block/pineapple_stage0" }, - "age=2,half=top": { "model": "unicopia:block/pineapple_stage1" }, - "age=3,half=top": { "model": "unicopia:block/pineapple_stage2" }, - "age=4,half=top": { "model": "unicopia:block/pineapple_stage3" }, - "age=5,half=top": { "model": "unicopia:block/pineapple_stage4" }, - "age=6,half=top": { "model": "unicopia:block/pineapple_stage5" }, - "age=7,half=top": { "model": "unicopia:block/pineapple_stage6" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/rice_block.json b/src/main/resources/assets/unicopia/blockstates/rice_block.json deleted file mode 100644 index 61251408..00000000 --- a/src/main/resources/assets/unicopia/blockstates/rice_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unicopia:block/rice_bale_bne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_east": true } }, - - { "apply": { "model": "unicopia:block/rice_bale_bne" }, "when": { "axis": "y", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bnw" }, "when": { "axis": "y", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bse" }, "when": { "axis": "y", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bsw" }, "when": { "axis": "y", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tne" }, "when": { "axis": "y", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tnw" }, "when": { "axis": "y", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tse" }, "when": { "axis": "y", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tsw" }, "when": { "axis": "y", "top_south_west": true } }, - - - { "apply": { "model": "unicopia:block/rice_bale_bne", "x": 90 }, "when": { "axis": "z", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bnw", "x": 90 }, "when": { "axis": "z", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bse", "x": 90 }, "when": { "axis": "z", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_bsw", "x": 90 }, "when": { "axis": "z", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tne", "x": 90 }, "when": { "axis": "z", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tnw", "x": 90 }, "when": { "axis": "z", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tse", "x": 90 }, "when": { "axis": "z", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/rice_bale_tsw", "x": 90 }, "when": { "axis": "z", "top_north_west": true } } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/sour_apple_leaves.json b/src/main/resources/assets/unicopia/blockstates/sour_apple_leaves.json deleted file mode 100644 index 30f1e327..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sour_apple_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/sour_apple_leaves" } - }, - { - "apply": { "model": "unicopia:block/sour_apple_leaves_flowering" }, - "when": { "stage": "flowering" } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/sour_apple_sprout.json b/src/main/resources/assets/unicopia/blockstates/sour_apple_sprout.json deleted file mode 100644 index f88ff7ea..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sour_apple_sprout.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/apple_sprout_stage0" - }, - "age=1": { - "model": "unicopia:block/apple_sprout_stage1" - }, - "age=2": { - "model": "unicopia:block/apple_sprout_stage2" - }, - "age=3": { - "model": "unicopia:block/apple_sprout_stage3" - }, - "age=4": { - "model": "unicopia:block/apple_sprout_stage4" - }, - "age=5": { - "model": "unicopia:block/apple_sprout_stage5" - }, - "age=6": { - "model": "unicopia:block/apple_sprout_stage6" - }, - "age=7": { - "model": "unicopia:block/apple_sprout_stage7" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/straw_block.json b/src/main/resources/assets/unicopia/blockstates/straw_block.json deleted file mode 100644 index 4f1da006..00000000 --- a/src/main/resources/assets/unicopia/blockstates/straw_block.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "multipart": [ - { "apply": { "model": "unicopia:block/straw_bale_bne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tne", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tnw", "x": 90, "y": 90 }, "when": { "axis": "x", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tse", "x": 90, "y": 90 }, "when": { "axis": "x", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tsw", "x": 90, "y": 90 }, "when": { "axis": "x", "top_north_east": true } }, - - { "apply": { "model": "unicopia:block/straw_bale_bne" }, "when": { "axis": "y", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bnw" }, "when": { "axis": "y", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bse" }, "when": { "axis": "y", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bsw" }, "when": { "axis": "y", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tne" }, "when": { "axis": "y", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tnw" }, "when": { "axis": "y", "top_north_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tse" }, "when": { "axis": "y", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tsw" }, "when": { "axis": "y", "top_south_west": true } }, - - - { "apply": { "model": "unicopia:block/straw_bale_bne", "x": 90 }, "when": { "axis": "z", "bottom_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bnw", "x": 90 }, "when": { "axis": "z", "bottom_south_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bse", "x": 90 }, "when": { "axis": "z", "top_south_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_bsw", "x": 90 }, "when": { "axis": "z", "top_south_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tne", "x": 90 }, "when": { "axis": "z", "bottom_north_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tnw", "x": 90 }, "when": { "axis": "z", "bottom_north_west": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tse", "x": 90 }, "when": { "axis": "z", "top_north_east": true } }, - { "apply": { "model": "unicopia:block/straw_bale_tsw", "x": 90 }, "when": { "axis": "z", "top_north_west": true } } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json deleted file mode 100644 index 372d59d5..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sweet_apple_leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/sweet_apple_leaves" } - }, - { - "apply": { "model": "unicopia:block/sweet_apple_leaves_flowering" }, - "when": { "stage": "flowering" } - } - ] -} diff --git a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json b/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json deleted file mode 100644 index f88ff7ea..00000000 --- a/src/main/resources/assets/unicopia/blockstates/sweet_apple_sprout.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/apple_sprout_stage0" - }, - "age=1": { - "model": "unicopia:block/apple_sprout_stage1" - }, - "age=2": { - "model": "unicopia:block/apple_sprout_stage2" - }, - "age=3": { - "model": "unicopia:block/apple_sprout_stage3" - }, - "age=4": { - "model": "unicopia:block/apple_sprout_stage4" - }, - "age=5": { - "model": "unicopia:block/apple_sprout_stage5" - }, - "age=6": { - "model": "unicopia:block/apple_sprout_stage6" - }, - "age=7": { - "model": "unicopia:block/apple_sprout_stage7" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/zap_leaves.json b/src/main/resources/assets/unicopia/blockstates/zap_leaves.json deleted file mode 100644 index 6d93be93..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_leaves.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "stage=hibernating": { - "model": "unicopia:block/zap_leaves" - }, - "stage=greening": { - "model": "unicopia:block/zap_leaves" - }, - "stage=flowering": { - "model": "unicopia:block/flowering_zap_leaves" - }, - "stage=fruiting": { - "model": "unicopia:block/zap_leaves" - }, - "stage=ripe": { - "model": "unicopia:block/zap_leaves" - } - } -} diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json deleted file mode 100644 index 7f8918c5..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth0", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json deleted file mode 100644 index 0d573b71..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth1", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json deleted file mode 100644 index c1934202..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth2", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json deleted file mode 100644 index 8b4ef33f..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth3", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json deleted file mode 100644 index cba7914b..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth4", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json deleted file mode 100644 index bd48d3f1..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth5", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json deleted file mode 100644 index c8f07f26..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth6", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json b/src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json deleted file mode 100644 index 2b479f70..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_sprout_stage7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/stem_growth7", - "textures": { - "stem": "minecraft:block/melon_stem" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloth_bed.json b/src/main/resources/assets/unicopia/models/block/cloth_bed.json deleted file mode 100644 index 91a36d8c..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloth_bed.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/spruce_planks" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_bed.json b/src/main/resources/assets/unicopia/models/block/cloud_bed.json deleted file mode 100644 index e30e3f72..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_bed.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "unicopia:block/cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_chest.json b/src/main/resources/assets/unicopia/models/block/cloud_chest.json deleted file mode 100644 index e30e3f72..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_chest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "unicopia:block/cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_full.json deleted file mode 100644 index 96ed79e2..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_full.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_full", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_x.json deleted file mode 100644 index a0e2924d..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_x.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_x", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xy.json deleted file mode 100644 index f38b7250..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xy", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xyz.json deleted file mode 100644 index 382df9ab..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xyz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xyz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xz.json deleted file mode 100644 index bad87c59..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_xz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_y.json deleted file mode 100644 index 2e2572a5..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_y.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_y", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_yz.json deleted file mode 100644 index b4e0a676..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_yz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_yz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_z.json deleted file mode 100644 index fa657f3b..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_dense_cloud_corner_z.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_z", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_full.json deleted file mode 100644 index 96ed79e2..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_full.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_full", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_x.json deleted file mode 100644 index a0e2924d..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_x.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_x", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xy.json deleted file mode 100644 index f38b7250..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xy", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xyz.json deleted file mode 100644 index 382df9ab..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xyz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xyz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xz.json deleted file mode 100644 index bad87c59..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_xz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_xz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_y.json deleted file mode 100644 index 2e2572a5..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_y.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_y", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_yz.json deleted file mode 100644 index b4e0a676..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_yz.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_yz", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_z.json deleted file mode 100644 index fa657f3b..00000000 --- a/src/main/resources/assets/unicopia/models/block/flattened_etched_cloud_corner_z.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flattened_cloud_corner_z", - "textures": { - "all": "unicopia:block/dense_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/flowering_zap_leaves.json b/src/main/resources/assets/unicopia/models/block/flowering_zap_leaves.json deleted file mode 100644 index d4d79822..00000000 --- a/src/main/resources/assets/unicopia/models/block/flowering_zap_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/flowering_zap_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/gold_root_stage0.json b/src/main/resources/assets/unicopia/models/block/gold_root_stage0.json deleted file mode 100644 index 8f0b22cd..00000000 --- a/src/main/resources/assets/unicopia/models/block/gold_root_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "unicopia:block/gold_root_stage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/gold_root_stage1.json b/src/main/resources/assets/unicopia/models/block/gold_root_stage1.json deleted file mode 100644 index 5315c2b8..00000000 --- a/src/main/resources/assets/unicopia/models/block/gold_root_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "unicopia:block/gold_root_stage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/gold_root_stage2.json b/src/main/resources/assets/unicopia/models/block/gold_root_stage2.json deleted file mode 100644 index cf262db5..00000000 --- a/src/main/resources/assets/unicopia/models/block/gold_root_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "unicopia:block/gold_root_stage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/gold_root_stage3.json b/src/main/resources/assets/unicopia/models/block/gold_root_stage3.json deleted file mode 100644 index 790fd135..00000000 --- a/src/main/resources/assets/unicopia/models/block/gold_root_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "unicopia:block/gold_root_stage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_leaves.json b/src/main/resources/assets/unicopia/models/block/green_apple_leaves.json deleted file mode 100644 index 9320d8ab..00000000 --- a/src/main/resources/assets/unicopia/models/block/green_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/green_apple_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/green_apple_leaves_flowering.json b/src/main/resources/assets/unicopia/models/block/green_apple_leaves_flowering.json deleted file mode 100644 index 3809eb32..00000000 --- a/src/main/resources/assets/unicopia/models/block/green_apple_leaves_flowering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/green_apple_leaves_flowering" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage0.json b/src/main/resources/assets/unicopia/models/block/oats_stage0.json deleted file mode 100644 index 0eb3069a..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage0" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage1.json b/src/main/resources/assets/unicopia/models/block/oats_stage1.json deleted file mode 100644 index 5bcf45ed..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage1" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage10_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage10_lower.json deleted file mode 100644 index 126b394e..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage10_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage10_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json b/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json deleted file mode 100644 index 160d2bd6..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage10_mid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage10_mid" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage10_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage10_upper.json deleted file mode 100644 index e3551738..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage10_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage10_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage11_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage11_lower.json deleted file mode 100644 index f8e678ab..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage11_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage11_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json b/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json deleted file mode 100644 index 399ac8b0..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage11_mid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage11_mid" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage11_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage11_upper.json deleted file mode 100644 index fc0fd0cd..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage11_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage11_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage2.json b/src/main/resources/assets/unicopia/models/block/oats_stage2.json deleted file mode 100644 index e6e4d396..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage2" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage3.json b/src/main/resources/assets/unicopia/models/block/oats_stage3.json deleted file mode 100644 index 0fa98fc6..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage3" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage4.json b/src/main/resources/assets/unicopia/models/block/oats_stage4.json deleted file mode 100644 index a3c5b132..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage4" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage5_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage5_lower.json deleted file mode 100644 index 8ba06faa..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage5_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage5_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage5_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage5_upper.json deleted file mode 100644 index a6b268e9..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage5_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage5_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage6_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage6_lower.json deleted file mode 100644 index 8d26e73c..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage6_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage6_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage6_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage6_upper.json deleted file mode 100644 index e1040e8d..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage6_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage6_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage7_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage7_lower.json deleted file mode 100644 index 1fd6ad91..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage7_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage7_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage7_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage7_upper.json deleted file mode 100644 index 979716e3..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage7_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage7_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage8_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage8_lower.json deleted file mode 100644 index b3a03e8b..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage8_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage8_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage8_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage8_upper.json deleted file mode 100644 index 02950f05..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage8_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage8_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage9_lower.json b/src/main/resources/assets/unicopia/models/block/oats_stage9_lower.json deleted file mode 100644 index 9e46c3f5..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage9_lower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage9_lower" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/oats_stage9_upper.json b/src/main/resources/assets/unicopia/models/block/oats_stage9_upper.json deleted file mode 100644 index a45d5194..00000000 --- a/src/main/resources/assets/unicopia/models/block/oats_stage9_upper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/crop", - "textures": { - "crop": "unicopia:block/oats_stage9_upper" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/pineapple.json b/src/main/resources/assets/unicopia/models/block/pineapple.json deleted file mode 100644 index 92ecb5cd..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple.json +++ /dev/null @@ -1,350 +0,0 @@ -{ - "textures": { - "bananas": "unicopia:block/bananas", - "particle": "#bananas" - }, - "elements": [ - { - "from": [3, 1, 4], - "to": [13, 11, 14], - "faces": { - "north": {"uv": [0.25, 0.25, 10.25, 10.25], "texture": "#bananas"}, - "east": {"uv": [1.25, 0.25, 11.25, 10.25], "texture": "#bananas"}, - "south": {"uv": [2.25, 0.25, 12.25, 10.25], "texture": "#bananas"}, - "west": {"uv": [3.25, 0.25, 13.25, 10.25], "texture": "#bananas"}, - "up": {"uv": [4.25, 0.25, 14.25, 10.25], "texture": "#bananas"}, - "down": {"uv": [5.25, 0.25, 15.25, 10.25], "texture": "#bananas"} - } - }, - { - "from": [8, -3, 5], - "to": [10, 3, 7], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [10, 0, 6], - "to": [12, 6, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [10, 4, 7], - "to": [12, 10, 9], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [8, 4, 7], - "to": [10, 10, 9], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [12, 5, 10], - "to": [14, 11, 12], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [7, 0, 6], - "to": [9, 6, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [8, 5, 2], - "to": [10, 11, 4], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [6, -2, 4], - "to": [8, 4, 6], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [10, -3, 6], - "to": [12, 3, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [11, 2, 4], - "to": [13, 8, 6], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [13, 5, 6], - "to": [15, 11, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [5, 5, 14], - "to": [11, 11, 16], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [1, 5, 6], - "to": [3, 11, 11], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [4, 2, 3], - "to": [6, 8, 5], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [5, 2, 6], - "to": [7, 8, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [7, -10, 9], - "to": [9, -1, 11], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [9, -7, 10], - "to": [11, -1, 12], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [9, -3, 11], - "to": [11, 3, 13], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [7, -3, 11], - "to": [9, 3, 13], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [11, -1, 9], - "to": [13, 5, 11], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [6, -7, 10], - "to": [8, 2, 12], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [7, -8, 6], - "to": [9, -2, 8], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [5, -9, 8], - "to": [7, -3, 10], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [9, -10, 7], - "to": [11, -1, 9], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [10, -6, 8], - "to": [12, 1, 10], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [9, -5, 5], - "to": [11, 1, 7], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [6, 0, 3], - "to": [8, 6, 5], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [4, -5, 5], - "to": [6, 1, 7], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [3, -5, 7], - "to": [5, 1, 9], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - }, - { - "from": [4, -3, 9], - "to": [6, 3, 11], - "faces": { - "north": {"uv": [0, 6, 2, 12], "texture": "#bananas"}, - "east": {"uv": [2, 6, 4, 12], "texture": "#bananas"}, - "south": {"uv": [0, 0, 2, 6], "texture": "#bananas"}, - "west": {"uv": [2, 0, 4, 6], "texture": "#bananas"}, - "down": {"uv": [2, 12, 0, 14], "texture": "#bananas"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage0.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage0.json deleted file mode 100644 index 31080c7e..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage1.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage1.json deleted file mode 100644 index 90dc9e67..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage2.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage2.json deleted file mode 100644 index bb96bb97..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage3.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage3.json deleted file mode 100644 index a4d17c24..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage4.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage4.json deleted file mode 100644 index 9dddc1f3..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage5.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage5.json deleted file mode 100644 index 705bc988..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stage6.json b/src/main/resources/assets/unicopia/models/block/pineapple_stage6.json deleted file mode 100644 index 41719887..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stage6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stage6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage0.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage0.json deleted file mode 100644 index 458221f1..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage1.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage1.json deleted file mode 100644 index 6c656c8c..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage2.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage2.json deleted file mode 100644 index 7c0a1566..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage3.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage3.json deleted file mode 100644 index 42fdad3a..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage4.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage4.json deleted file mode 100644 index 045528d6..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage5.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage5.json deleted file mode 100644 index 354ca245..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage6.json b/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage6.json deleted file mode 100644 index 235ee57b..00000000 --- a/src/main/resources/assets/unicopia/models/block/pineapple_stem_stage6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "unicopia:block/pineapple_stem_stage6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_bne.json b/src/main/resources/assets/unicopia/models/block/rice_bale_bne.json deleted file mode 100644 index 3c280742..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_bne.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bne", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_bnw.json b/src/main/resources/assets/unicopia/models/block/rice_bale_bnw.json deleted file mode 100644 index 9b3d6ce0..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_bnw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bnw", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_bse.json b/src/main/resources/assets/unicopia/models/block/rice_bale_bse.json deleted file mode 100644 index 6fd0b774..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_bse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bse", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_bsw.json b/src/main/resources/assets/unicopia/models/block/rice_bale_bsw.json deleted file mode 100644 index c2ec227a..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_bsw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bsw", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_tne.json b/src/main/resources/assets/unicopia/models/block/rice_bale_tne.json deleted file mode 100644 index 81eb613c..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_tne.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tne", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_tnw.json b/src/main/resources/assets/unicopia/models/block/rice_bale_tnw.json deleted file mode 100644 index c4bef47d..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_tnw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tnw", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_tse.json b/src/main/resources/assets/unicopia/models/block/rice_bale_tse.json deleted file mode 100644 index f58ce7d1..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_tse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tse", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/rice_bale_tsw.json b/src/main/resources/assets/unicopia/models/block/rice_bale_tsw.json deleted file mode 100644 index 9608f77e..00000000 --- a/src/main/resources/assets/unicopia/models/block/rice_bale_tsw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tsw", - "textures": { - "top": "farmersdelight:block/rice_bale_top", - "particle": "farmersdelight:block/rice_bale_side", - "side": "farmersdelight:block/rice_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sour_apple_leaves.json b/src/main/resources/assets/unicopia/models/block/sour_apple_leaves.json deleted file mode 100644 index 5c5c2d5b..00000000 --- a/src/main/resources/assets/unicopia/models/block/sour_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/sour_apple_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sour_apple_leaves_flowering.json b/src/main/resources/assets/unicopia/models/block/sour_apple_leaves_flowering.json deleted file mode 100644 index a3e5a7bd..00000000 --- a/src/main/resources/assets/unicopia/models/block/sour_apple_leaves_flowering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/sour_apple_leaves_flowering" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_bne.json b/src/main/resources/assets/unicopia/models/block/straw_bale_bne.json deleted file mode 100644 index fef62f35..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_bne.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bne", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_bnw.json b/src/main/resources/assets/unicopia/models/block/straw_bale_bnw.json deleted file mode 100644 index a5b3162b..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_bnw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bnw", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_bse.json b/src/main/resources/assets/unicopia/models/block/straw_bale_bse.json deleted file mode 100644 index 95d23675..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_bse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bse", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_bsw.json b/src/main/resources/assets/unicopia/models/block/straw_bale_bsw.json deleted file mode 100644 index 3a5ef025..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_bsw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_bsw", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_tne.json b/src/main/resources/assets/unicopia/models/block/straw_bale_tne.json deleted file mode 100644 index f8cc37a5..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_tne.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tne", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_tnw.json b/src/main/resources/assets/unicopia/models/block/straw_bale_tnw.json deleted file mode 100644 index 1b06dba9..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_tnw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tnw", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_tse.json b/src/main/resources/assets/unicopia/models/block/straw_bale_tse.json deleted file mode 100644 index 44d1f681..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_tse.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tse", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/straw_bale_tsw.json b/src/main/resources/assets/unicopia/models/block/straw_bale_tsw.json deleted file mode 100644 index 0c74b850..00000000 --- a/src/main/resources/assets/unicopia/models/block/straw_bale_tsw.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/hay_bale_tsw", - "textures": { - "top": "farmersdelight:block/straw_bale_end", - "particle": "farmersdelight:block/straw_bale_side", - "side": "farmersdelight:block/straw_bale_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json deleted file mode 100644 index fbf5020c..00000000 --- a/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/sweet_apple_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves_flowering.json b/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves_flowering.json deleted file mode 100644 index 773c2e74..00000000 --- a/src/main/resources/assets/unicopia/models/block/sweet_apple_leaves_flowering.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/sweet_apple_leaves_flowering" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_bne.json b/src/main/resources/assets/unicopia/models/block/template_bale_bne.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_bne.json rename to src/main/resources/assets/unicopia/models/block/template_bale_bne.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_bnw.json b/src/main/resources/assets/unicopia/models/block/template_bale_bnw.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_bnw.json rename to src/main/resources/assets/unicopia/models/block/template_bale_bnw.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_bse.json b/src/main/resources/assets/unicopia/models/block/template_bale_bse.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_bse.json rename to src/main/resources/assets/unicopia/models/block/template_bale_bse.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_bsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_bsw.json rename to src/main/resources/assets/unicopia/models/block/template_bale_bsw.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_tne.json b/src/main/resources/assets/unicopia/models/block/template_bale_tne.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_tne.json rename to src/main/resources/assets/unicopia/models/block/template_bale_tne.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_tnw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_tnw.json rename to src/main/resources/assets/unicopia/models/block/template_bale_tnw.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_tse.json b/src/main/resources/assets/unicopia/models/block/template_bale_tse.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_tse.json rename to src/main/resources/assets/unicopia/models/block/template_bale_tse.json diff --git a/src/main/resources/assets/unicopia/models/block/hay_bale_tsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/hay_bale_tsw.json rename to src/main/resources/assets/unicopia/models/block/template_bale_tsw.json diff --git a/src/main/resources/assets/unicopia/models/block/zap_leaves.json b/src/main/resources/assets/unicopia/models/block/zap_leaves.json deleted file mode 100644 index e8066248..00000000 --- a/src/main/resources/assets/unicopia/models/block/zap_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/leaves", - "textures": { - "all": "unicopia:block/zap_leaves" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/cloth_bed.json b/src/main/resources/assets/unicopia/models/item/cloth_bed.json deleted file mode 100644 index cf15d523..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloth_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/template_bed", - "textures": { - "particle": "minecraft:block/white_wool" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_bed.json b/src/main/resources/assets/unicopia/models/item/cloud_bed.json deleted file mode 100644 index 70faf964..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_bed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/template_bed", - "textures": { - "particle": "unicopia:block/cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_chest.json b/src/main/resources/assets/unicopia/models/item/cloud_chest.json deleted file mode 100644 index 0ff9d87b..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_chest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/chest", - "textures": { - "particle": "unicopia:block/cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/flowering_zap_leaves.json b/src/main/resources/assets/unicopia/models/item/flowering_zap_leaves.json deleted file mode 100644 index 9e14ee8d..00000000 --- a/src/main/resources/assets/unicopia/models/item/flowering_zap_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/flowering_zap_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/green_apple_leaves.json b/src/main/resources/assets/unicopia/models/item/green_apple_leaves.json deleted file mode 100644 index ddc130e2..00000000 --- a/src/main/resources/assets/unicopia/models/item/green_apple_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/green_apple_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sour_apple_leaves.json b/src/main/resources/assets/unicopia/models/item/sour_apple_leaves.json deleted file mode 100644 index c1f5b4ad..00000000 --- a/src/main/resources/assets/unicopia/models/item/sour_apple_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/sour_apple_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json b/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json deleted file mode 100644 index 0892ce32..00000000 --- a/src/main/resources/assets/unicopia/models/item/sweet_apple_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/sweet_apple_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/zap_leaves.json b/src/main/resources/assets/unicopia/models/item/zap_leaves.json deleted file mode 100644 index 6a481c2e..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/zap_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_crown_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage10_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_crown_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_crown_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage11_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_crown_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage10.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage10_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage10.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage11.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage11_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage11.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage5_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage6_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage7.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage7_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage7.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage8.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage8_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage8.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png b/src/main/resources/assets/unicopia/textures/block/oats_stage9.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage9_lower.png rename to src/main/resources/assets/unicopia/textures/block/oats_stage9.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage5_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage6_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage7_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage8_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage9_upper.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage10_mid.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage10_mid.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/oats_stage11_mid.png b/src/main/resources/assets/unicopia/textures/block/oats_stem_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/oats_stage11_mid.png rename to src/main/resources/assets/unicopia/textures/block/oats_stem_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage0.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage0.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage1.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage1.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage2.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage2.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage3.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage3.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage4.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage4.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage5.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage5.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage6.png b/src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stem_stage6.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_bottom_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage0.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage0.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage1.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage1.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage2.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage2.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage3.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage3.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage4.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage4.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage5.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage5.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/pineapple_stage6.png b/src/main/resources/assets/unicopia/textures/block/pineapple_top_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/pineapple_stage6.png rename to src/main/resources/assets/unicopia/textures/block/pineapple_top_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_crown_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_crown_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_crown_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_crown_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage0.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage0.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage1.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage1.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage10.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage10.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage11.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage11.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage2.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage2.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage3.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage3.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage4.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage4.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage5_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage5_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage6_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage6_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage7_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage7.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage7_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage7.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage8_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage8.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage8_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage8.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage9_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage9.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage9_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stage9.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage5_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage5_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage6_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage6_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage7_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage7_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage8_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage8_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage9_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage9_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage10_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/fall_oats_stage11_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/fall/oats_stem_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_crown_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_crown_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_crown_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_crown_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage0.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage0.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage1.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage1.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage10.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage10.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage11.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage11.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage2.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage2.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage3.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage3.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage4.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage4.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage5_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage5_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage6_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage6_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage7_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage7.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage7_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage7.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage8_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage8.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage8_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage8.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage9_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage9.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage9_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stage9.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage5_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage5_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage6_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage6_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage7_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage7_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage8_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage8_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage9_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage9_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage10_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/summer_oats_stage11_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/summer/oats_stem_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_crown_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_crown_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_crown_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_crown_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage0.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage0.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage1.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage1.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage10.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage10.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage11.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage11.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage2.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage2.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage3.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage3.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage4.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage4.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage5_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage5_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage6_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage6_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage6.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage7_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage7.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage7_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage7.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage8_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage8.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage8_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage8.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage9_lower.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage9.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage9_lower.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stage9.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage5_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage5_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage6_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage6_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage7_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage7_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage8_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage8_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage3.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage9_upper.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage4.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage9_upper.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage4.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage5.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage10_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage5.png diff --git a/src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_mid.png b/src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage6.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/winter_oats_stage11_mid.png rename to src/main/resources/assets/unicopia/textures/block/seasons/winter/oats_stem_stage6.png From 956b55dc3006700db3d120c87d48e1b6e8fb73d9 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 16 Mar 2024 15:26:45 +0000 Subject: [PATCH 21/44] Datagen the rest of the blocks and fix some texturing on soggy cloud blocks --- .../unicopia/block/SlimePustuleBlock.java | 2 +- .../datagen/providers/BlockModels.java | 165 ++----- .../datagen/providers/FireModels.java | 33 ++ .../datagen/providers/ItemModels.java | 2 + .../providers/UBlockStateModelGenerator.java | 447 ++++++++++++++++++ .../datagen/providers/UModelProvider.java | 168 +------ .../unicopia/blockstates/apple_pie.json | 12 - .../assets/unicopia/blockstates/bananas.json | 7 - .../unicopia/blockstates/carved_cloud.json | 10 - .../blockstates/chiselled_chitin_hull.json | 10 - .../assets/unicopia/blockstates/chitin.json | 5 - .../unicopia/blockstates/chitin_spikes.json | 10 - .../unicopia/blockstates/clam_shell.json | 8 - .../blockstates/cloud_brick_stairs.json | 209 -------- .../blockstates/cloud_plank_stairs.json | 209 -------- .../unicopia/blockstates/cloud_stairs.json | 209 -------- .../blockstates/dense_cloud_stairs.json | 209 -------- .../blockstates/etched_cloud_stairs.json | 209 -------- .../blockstates/frosted_obsidian.json | 16 - .../assets/unicopia/blockstates/hive.json | 68 --- .../unicopia/blockstates/mango_leaves.json | 7 - .../unicopia/blockstates/mysterious_egg.json | 7 - .../assets/unicopia/blockstates/rocks.json | 28 -- .../unicopia/blockstates/scallop_shell.json | 8 - .../unicopia/blockstates/shaping_bench.json | 7 - .../unicopia/blockstates/slime_pustule.json | 8 - .../unicopia/blockstates/soggy_cloud.json | 5 - .../blockstates/soggy_cloud_slab.json | 7 - .../blockstates/soggy_cloud_stairs.json | 209 -------- .../unicopia/blockstates/spectral_fire.json | 90 ---- .../unicopia/blockstates/surface_chitin.json | 6 - .../unicopia/blockstates/turret_shell.json | 8 - .../unicopia/blockstates/unstable_cloud.json | 5 - .../unicopia/blockstates/weather_vane.json | 5 - .../blockstates/zap_leaves_placeholder.json | 7 - .../unicopia/models/block/apple_pie.json | 9 - .../models/block/apple_pie_corner.json | 9 - .../models/block/apple_pie_elbow.json | 9 - .../models/block/apple_pie_straight.json | 9 - .../unicopia/models/block/carved_cloud.json | 8 - .../models/block/chiselled_chitin_hull.json | 8 - .../assets/unicopia/models/block/chitin.json | 8 - .../unicopia/models/block/chitin_spikes.json | 6 - .../models/block/cloud_brick_stairs.json | 8 - .../block/cloud_brick_stairs_inner.json | 8 - .../block/cloud_brick_stairs_outer.json | 8 - .../models/block/cloud_plank_stairs.json | 8 - .../block/cloud_plank_stairs_inner.json | 8 - .../block/cloud_plank_stairs_outer.json | 8 - .../models/block/dense_cloud_stairs.json | 8 - .../block/dense_cloud_stairs_inner.json | 8 - .../block/dense_cloud_stairs_outer.json | 8 - .../models/block/etched_cloud_stairs.json | 8 - .../block/etched_cloud_stairs_inner.json | 8 - .../block/etched_cloud_stairs_outer.json | 8 - .../models/block/flattened_corner_full.json | 3 +- .../models/block/flattened_corner_x.json | 3 +- .../models/block/flattened_corner_xy.json | 3 +- .../models/block/flattened_corner_xyz.json | 3 +- .../models/block/flattened_corner_xz.json | 3 +- .../models/block/flattened_corner_y.json | 3 +- .../models/block/flattened_corner_yz.json | 3 +- .../models/block/flattened_corner_z.json | 3 +- .../models/block/frosted_obsidian_0.json | 6 - .../models/block/frosted_obsidian_1.json | 6 - .../models/block/frosted_obsidian_2.json | 6 - .../models/block/frosted_obsidian_3.json | 6 - ...nner.json => inner_seethrough_stairs.json} | 25 +- ..._egg_1.json => mysterious_egg_stage1.json} | 0 ..._egg_2.json => mysterious_egg_stage2.json} | 0 ..._egg_3.json => mysterious_egg_stage3.json} | 0 ...uter.json => outer_seethrough_stairs.json} | 26 +- .../unicopia/models/block/pie_corner.json | 8 +- .../unicopia/models/block/pie_elbow.json | 16 +- .../unicopia/models/block/pie_full.json | 8 +- .../unicopia/models/block/pie_straight.json | 8 +- .../models/block/scallop_shell_1.json | 6 - .../models/block/scallop_shell_2.json | 6 - .../models/block/scallop_shell_3.json | 6 - .../models/block/scallop_shell_4.json | 6 - ...oud_stairs.json => seethrough_stairs.json} | 19 +- ...le_rope.json => slime_pustule_string.json} | 0 .../unicopia/models/block/soggy_cloud.json | 8 - .../models/block/soggy_cloud_slab.json | 8 - .../models/block/soggy_cloud_slab_top.json | 8 - .../models/block/soggy_cloud_stairs.json | 8 - .../block/soggy_cloud_stairs_inner.json | 8 - .../block/soggy_cloud_stairs_outer.json | 8 - .../models/block/stomped_apple_pie.json | 9 - .../block/stomped_apple_pie_corner.json | 9 - .../models/block/stomped_apple_pie_elbow.json | 9 - .../block/stomped_apple_pie_straight.json | 9 - .../unicopia/models/block/surface_chitin.json | 8 - .../models/block/surface_chitin_snowy.json | 8 - .../models/block/template_bale_bne.json | 30 +- .../models/block/template_bale_bnw.json | 6 +- .../models/block/template_bale_bse.json | 6 +- .../models/block/template_bale_bsw.json | 6 +- .../models/block/template_bale_tne.json | 6 +- .../models/block/template_bale_tnw.json | 6 +- .../models/block/template_bale_tse.json | 6 +- .../models/block/template_bale_tsw.json | 6 +- ...lam_shell_1.json => template_shell_1.json} | 5 +- ...lam_shell_2.json => template_shell_2.json} | 5 +- ...lam_shell_3.json => template_shell_3.json} | 5 +- ...lam_shell_4.json => template_shell_4.json} | 5 +- .../unicopia/models/block/turret_shell_1.json | 6 - .../unicopia/models/block/turret_shell_2.json | 6 - .../unicopia/models/block/turret_shell_3.json | 6 - .../unicopia/models/block/turret_shell_4.json | 6 - .../unicopia/models/block/weather_vane.json | 6 - .../unicopia/models/item/carved_cloud.json | 3 - .../models/item/chiselled_chitin_hull.json | 3 - .../assets/unicopia/models/item/chitin.json | 3 - .../unicopia/models/item/chitin_spikes.json | 3 - .../models/item/cloud_brick_stairs.json | 3 - .../unicopia/models/item/cloud_lump.json | 6 - .../unicopia/models/item/cloud_pillar.json | 2 +- .../models/item/cloud_plank_stairs.json | 3 - .../unicopia/models/item/cloud_stairs.json | 3 - .../models/item/dense_cloud_stairs.json | 3 - .../models/item/etched_cloud_stairs.json | 3 - .../unicopia/models/item/filled_jar.json | 3 - .../assets/unicopia/models/item/gemstone.json | 20 - .../models/item/gemstone_corrupted.json | 6 - .../unicopia/models/item/gemstone_pure.json | 6 - .../assets/unicopia/models/item/hive.json | 6 - .../unicopia/models/item/mango_leaves.json | 3 - .../unicopia/models/item/mysterious_egg.json | 2 +- .../unicopia/models/item/plunder_vine.json | 3 - .../unicopia/models/item/shaping_bench.json | 3 - .../unicopia/models/item/slime_pustule.json | 3 - .../unicopia/models/item/soggy_cloud.json | 3 - .../models/item/soggy_cloud_slab.json | 3 - .../unicopia/models/item/surface_chitin.json | 3 - ...{sunglasses.json => template_eyewear.json} | 0 .../unicopia/models/item/template_mug.json | 3 - .../unicopia/models/item/unstable_cloud.json | 3 - .../unicopia/models/item/weather_vane.json | 6 - ...ple_pie_inner.png => apple_pie_inside.png} | Bin ...carved_cloud.png => carved_cloud_side.png} | Bin ...dian_0.png => frosted_obsidian_stage0.png} | Bin ...dian_1.png => frosted_obsidian_stage1.png} | Bin ...dian_2.png => frosted_obsidian_stage2.png} | Bin ...dian_3.png => frosted_obsidian_stage3.png} | Bin 145 files changed, 621 insertions(+), 2471 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/FireModels.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java delete mode 100644 src/main/resources/assets/unicopia/blockstates/apple_pie.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/bananas.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/carved_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/chiselled_chitin_hull.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/chitin.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/chitin_spikes.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/clam_shell.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_brick_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_plank_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/etched_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/frosted_obsidian.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/hive.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/mango_leaves.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/mysterious_egg.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/rocks.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/scallop_shell.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/shaping_bench.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/slime_pustule.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/soggy_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/soggy_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/soggy_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/spectral_fire.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/surface_chitin.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/turret_shell.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/unstable_cloud.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/weather_vane.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/zap_leaves_placeholder.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_pie.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_pie_corner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_pie_elbow.json delete mode 100644 src/main/resources/assets/unicopia/models/block/apple_pie_straight.json delete mode 100644 src/main/resources/assets/unicopia/models/block/carved_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chiselled_chitin_hull.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chitin.json delete mode 100644 src/main/resources/assets/unicopia/models/block/chitin_spikes.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_brick_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_plank_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/frosted_obsidian_0.json delete mode 100644 src/main/resources/assets/unicopia/models/block/frosted_obsidian_1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/frosted_obsidian_2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/frosted_obsidian_3.json rename src/main/resources/assets/unicopia/models/block/{cloud_stairs_inner.json => inner_seethrough_stairs.json} (66%) rename src/main/resources/assets/unicopia/models/block/{mysterious_egg_1.json => mysterious_egg_stage1.json} (100%) rename src/main/resources/assets/unicopia/models/block/{mysterious_egg_2.json => mysterious_egg_stage2.json} (100%) rename src/main/resources/assets/unicopia/models/block/{mysterious_egg_3.json => mysterious_egg_stage3.json} (100%) rename src/main/resources/assets/unicopia/models/block/{cloud_stairs_outer.json => outer_seethrough_stairs.json} (52%) delete mode 100644 src/main/resources/assets/unicopia/models/block/scallop_shell_1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/scallop_shell_2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/scallop_shell_3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/scallop_shell_4.json rename src/main/resources/assets/unicopia/models/block/{cloud_stairs.json => seethrough_stairs.json} (59%) rename src/main/resources/assets/unicopia/models/block/{slime_pustule_rope.json => slime_pustule_string.json} (100%) delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud_slab_top.json delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_inner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_outer.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stomped_apple_pie.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stomped_apple_pie_corner.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stomped_apple_pie_elbow.json delete mode 100644 src/main/resources/assets/unicopia/models/block/stomped_apple_pie_straight.json delete mode 100644 src/main/resources/assets/unicopia/models/block/surface_chitin.json delete mode 100644 src/main/resources/assets/unicopia/models/block/surface_chitin_snowy.json rename src/main/resources/assets/unicopia/models/block/{clam_shell_1.json => template_shell_1.json} (84%) rename src/main/resources/assets/unicopia/models/block/{clam_shell_2.json => template_shell_2.json} (90%) rename src/main/resources/assets/unicopia/models/block/{clam_shell_3.json => template_shell_3.json} (92%) rename src/main/resources/assets/unicopia/models/block/{clam_shell_4.json => template_shell_4.json} (95%) delete mode 100644 src/main/resources/assets/unicopia/models/block/turret_shell_1.json delete mode 100644 src/main/resources/assets/unicopia/models/block/turret_shell_2.json delete mode 100644 src/main/resources/assets/unicopia/models/block/turret_shell_3.json delete mode 100644 src/main/resources/assets/unicopia/models/block/turret_shell_4.json delete mode 100644 src/main/resources/assets/unicopia/models/block/weather_vane.json delete mode 100644 src/main/resources/assets/unicopia/models/item/carved_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chiselled_chitin_hull.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chitin.json delete mode 100644 src/main/resources/assets/unicopia/models/item/chitin_spikes.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_brick_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_lump.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_plank_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/etched_cloud_stairs.json delete mode 100644 src/main/resources/assets/unicopia/models/item/filled_jar.json delete mode 100644 src/main/resources/assets/unicopia/models/item/gemstone.json delete mode 100644 src/main/resources/assets/unicopia/models/item/gemstone_corrupted.json delete mode 100644 src/main/resources/assets/unicopia/models/item/gemstone_pure.json delete mode 100644 src/main/resources/assets/unicopia/models/item/hive.json delete mode 100644 src/main/resources/assets/unicopia/models/item/mango_leaves.json delete mode 100644 src/main/resources/assets/unicopia/models/item/plunder_vine.json delete mode 100644 src/main/resources/assets/unicopia/models/item/shaping_bench.json delete mode 100644 src/main/resources/assets/unicopia/models/item/slime_pustule.json delete mode 100644 src/main/resources/assets/unicopia/models/item/soggy_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/soggy_cloud_slab.json delete mode 100644 src/main/resources/assets/unicopia/models/item/surface_chitin.json rename src/main/resources/assets/unicopia/models/item/{sunglasses.json => template_eyewear.json} (100%) delete mode 100644 src/main/resources/assets/unicopia/models/item/unstable_cloud.json delete mode 100644 src/main/resources/assets/unicopia/models/item/weather_vane.json rename src/main/resources/assets/unicopia/textures/block/{apple_pie_inner.png => apple_pie_inside.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{carved_cloud.png => carved_cloud_side.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{frosted_obsidian_0.png => frosted_obsidian_stage0.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{frosted_obsidian_1.png => frosted_obsidian_stage1.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{frosted_obsidian_2.png => frosted_obsidian_stage2.png} (100%) rename src/main/resources/assets/unicopia/textures/block/{frosted_obsidian_3.png => frosted_obsidian_stage3.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/block/SlimePustuleBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SlimePustuleBlock.java index 97406a32..4d7d58e8 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/SlimePustuleBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/SlimePustuleBlock.java @@ -40,7 +40,7 @@ import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; public class SlimePustuleBlock extends Block { - private static final EnumProperty SHAPE = EnumProperty.of("shape", Shape.class); + public static final EnumProperty SHAPE = EnumProperty.of("shape", Shape.class); private static final BooleanProperty POWERED = Properties.POWERED; private static final Direction[] DIRECTIONS = Arrays.stream(Direction.values()) .filter(direction -> direction != Direction.UP) diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java index 7473ebd2..90f3f2bb 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -1,47 +1,39 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.IntStream; import java.util.stream.Stream; +import com.google.gson.JsonElement; import com.minelittlepony.unicopia.Unicopia; -import com.minelittlepony.unicopia.block.EdibleBlock; -import com.minelittlepony.unicopia.block.FruitBearingBlock; -import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; -import com.minelittlepony.unicopia.server.world.ZapAppleStageStore; -import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.BlockStateSupplier; -import net.minecraft.data.client.BlockStateVariant; -import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.Model; import net.minecraft.data.client.ModelIds; import net.minecraft.data.client.Models; -import net.minecraft.data.client.MultipartBlockStateSupplier; import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; import net.minecraft.data.client.TexturedModel; import net.minecraft.data.client.VariantSettings; -import net.minecraft.data.client.VariantsBlockStateSupplier; -import net.minecraft.data.client.When; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.EnumProperty; -import net.minecraft.state.property.Properties; -import net.minecraft.state.property.Property; import net.minecraft.util.Identifier; import net.minecraft.util.Pair; -import net.minecraft.util.StringIdentifiable; -import net.minecraft.util.math.Direction; public interface BlockModels { + TextureKey SHELL = TextureKey.of("shell"); + TextureKey STEP = TextureKey.of("step"); + Model FRUIT = block("fruit", TextureKey.CROSS); + Model STRAIGHT_STAIRS = block("seethrough_stairs", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); + Model INNER_STAIRS = block("inner_seethrough_stairs", "_inner", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); + Model OUTER_STAIRS = block("outer_seethrough_stairs", "_outer", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); + + Factory CROP = Factory.of(TextureMap::crop, Models.CROP); + Factory CUBE_ALL = Factory.of(TextureMap::all, Models.CUBE_ALL); + TexturedModel.Factory SPIKES = TexturedModel.makeFactory(b -> TextureMap.crop(ModelIds.getBlockModelId(b)), Models.CROP); String[] FLATTENED_MODEL_SUFFEXES = {"xyz", "yz", "xy", "y", "xz", "z", "x", "full"}; String[] FLATTENED_MODEL_SUFFEXES_ROT = {"xyz", "xy", "yz", "y", "xz", "x", "z", "full"}; @@ -53,6 +45,12 @@ public interface BlockModels { Model[] FLATTENED_MODELS = Arrays.stream(FLATTENED_MODEL_SUFFEXES) .map(variant -> block("flattened_corner_" + variant, "_corner_" + variant, TextureKey.ALL)) .toArray(Model[]::new); + Model[] SHELL_MODELS = IntStream.range(1, 5) + .mapToObj(i -> block("template_shell_" + i, "_" + i, SHELL)) + .toArray(Model[]::new); + Model[] PIE_MODELS = Stream.of("_full", "_elbow", "_straight", "_corner") + .map(variant -> block("pie" + variant, variant, TextureKey.TOP, TextureKey.BOTTOM, TextureKey.SIDE, TextureKey.INSIDE)) + .toArray(Model[]::new); @SuppressWarnings("unchecked") Pair[] BALE_MODELS = Stream.of("bnw", "bne", "bsw", "bse", "tnw", "tne", "tsw", "tse") .map(suffex -> new Pair<>(block("template_bale_" + suffex, "_" + suffex, TextureKey.TOP, TextureKey.SIDE), "_" + suffex)) @@ -74,124 +72,15 @@ public interface BlockModels { return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.of(variant), requiredTextureKeys); } - static void registerCompactedBlock(BlockStateModelGenerator modelGenerator, Block block) { - for (Model model : FLATTENED_MODELS) { - model.upload(block, TextureMap.all(ModelIds.getBlockModelId(block).withPath(p -> p.replace("compacted_", ""))), modelGenerator.modelCollector); - } - modelGenerator.blockStateCollector.accept(createCompactedBlockState(block)); - } - - private static BlockStateSupplier createCompactedBlockState(Block block) { - MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(block); - for (byte i = 0; i < FLATTENED_MODEL_ROTATIONS.length; i++) { - final BooleanProperty yAxis = (i & 0b100) == 0 ? Properties.DOWN : Properties.UP; - final BooleanProperty xAxis = (i & 0b010) == 0 ? Properties.NORTH: Properties.SOUTH; - final BooleanProperty zAxis = (i & 0b001) == 0 ? Properties.EAST : Properties.WEST; - final VariantSettings.Rotation xRot = yAxis == Properties.DOWN ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R180; - final VariantSettings.Rotation yRot = FLATTENED_MODEL_ROTATIONS[i]; - final String[] suffexes = yRot.ordinal() % 2 == 0 ? FLATTENED_MODEL_SUFFEXES : FLATTENED_MODEL_SUFFEXES_ROT; - for (byte v = 0; v < suffexes.length; v++) { - supplier.with(When.create() - .set(yAxis, (v & 0b100) != 0) - .set(xAxis, (v & 0b010) != 0) - .set(zAxis, (v & 0b001) != 0), BlockStateVariant.create() - .put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v])) - .put(VariantSettings.UVLOCK, true) - .put(VariantSettings.X, xRot) - .put(VariantSettings.Y, yRot) - ); - } - } - return supplier; - } - - static void registerChest(BlockStateModelGenerator modelGenerator, Block chest, Block particleSource) { - modelGenerator.registerBuiltin(ModelIds.getBlockModelId(chest), particleSource).includeWithoutItem(chest); - ItemModels.CHEST.upload(ModelIds.getItemModelId(chest.asItem()), TextureMap.particle(particleSource), modelGenerator.modelCollector); - } - - static void registerBed(BlockStateModelGenerator modelGenerator, Block bed, Block particleSource) { - modelGenerator.registerBuiltinWithParticle(bed, ModelIds.getBlockModelId(particleSource)); - modelGenerator.registerBed(bed, particleSource); - } - - static void registerBale(BlockStateModelGenerator modelGenerator, Identifier blockId, Identifier baseBlockId, String endSuffex) { - Identifier top = baseBlockId.withPath(p -> "block/" + p + endSuffex); - Identifier side = baseBlockId.withPath(p -> "block/" + p + "_side"); - TextureMap textures = new TextureMap().put(TextureKey.TOP, top).put(TextureKey.SIDE, side); - - MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(Registries.BLOCK.getOrEmpty(blockId).orElseGet(() -> { - return Registry.register(Registries.BLOCK, blockId, new EdibleBlock(blockId, blockId, false)); - })); - Map uploadedModels = new HashMap<>(); - - for (Direction.Axis axis : Direction.Axis.VALUES) { - for (int i = 0; i < EdibleBlock.SEGMENTS.length; i++) { - BooleanProperty segment = EdibleBlock.SEGMENTS[i]; - segment.getName(); - supplier.with(When.create().set(EdibleBlock.AXIS, axis).set(segment, true), BlockStateVariant.create() - .put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(i, ii -> { - return BALE_MODELS[ii].getLeft().upload(blockId.withPath(p -> "block/" + p + BALE_MODELS[ii].getRight()), textures, modelGenerator.modelCollector); - })) - .put(VariantSettings.X, axis == Direction.Axis.Y ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R90) - .put(VariantSettings.Y, axis == Direction.Axis.X ? VariantSettings.Rotation.R90 : VariantSettings.Rotation.R0) - ); - } + public interface Factory { + static Factory of(Function textureFunc, Model model) { + return (block, suffix) -> TexturedModel.makeFactory(b -> textureFunc.apply(ModelIds.getBlockSubModelId(b, suffix)), model).get(block); } - modelGenerator.blockStateCollector.accept(supplier); - } + TexturedModel get(Block block, String suffix); - static void registerCropWithoutItem(BlockStateModelGenerator modelGenerator, Block crop, Property ageProperty, int ... stages) { - if (ageProperty.getValues().size() != stages.length) { - throw new IllegalArgumentException(); + default Identifier upload(Block block, String suffix, BiConsumer> writer) { + return get(block, suffix).upload(block, suffix, writer); } - Int2ObjectOpenHashMap uploadedModels = new Int2ObjectOpenHashMap<>(); - modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(ageProperty).register(integer -> { - Identifier identifier = uploadedModels.computeIfAbsent(stages[integer], stage -> modelGenerator.createSubModel(crop, "_stage" + stage, Models.CROP, TextureMap::crop)); - return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); - }))); - } - - static & StringIdentifiable> void registerTallCrop(BlockStateModelGenerator modelGenerator, Block crop, - Property ageProperty, - EnumProperty partProperty, - int[] ... ageTextureIndices) { - Map uploadedModels = new HashMap<>(); - modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(partProperty, ageProperty).register((part, age) -> { - int i = ageTextureIndices[part.ordinal()][age]; - Identifier identifier = uploadedModels.computeIfAbsent("_" + part.asString() + "_stage" + i, variant -> modelGenerator.createSubModel(crop, variant, Models.CROSS, TextureMap::cross)); - return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); - }))); - } - - static void registerFloweringLeaves(BlockStateModelGenerator modelGenerator, Block block) { - Identifier baseModel = TexturedModel.LEAVES.upload(block, modelGenerator.modelCollector); - Identifier floweringModel = Models.CUBE_ALL.upload(block, "_flowering", TextureMap.of(TextureKey.ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelGenerator.modelCollector); - modelGenerator.blockStateCollector.accept(MultipartBlockStateSupplier.create(block) - .with(BlockStateVariant.create().put(VariantSettings.MODEL, baseModel)) - .with(When.create().set(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.FLOWERING), BlockStateVariant.create().put(VariantSettings.MODEL, floweringModel))); - } - - static void registerZapLeaves(BlockStateModelGenerator modelGenerator, Block block) { - Identifier baseModel = TexturedModel.LEAVES.upload(block, modelGenerator.modelCollector); - Identifier floweringModel = Registries.BLOCK.getId(block).withPrefixedPath("block/flowering_"); - modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(block) - .coordinate(BlockStateVariantMap.create(ZapAppleLeavesBlock.STAGE) - .register(stage -> BlockStateVariant.create() - .put(VariantSettings.MODEL, stage == ZapAppleStageStore.Stage.FLOWERING ? floweringModel : baseModel)))); - } - - static void createSproutStages(BlockStateModelGenerator modelGenerator) { - for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { - Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelGenerator.modelCollector); - } - } - - static void registerSprout(BlockStateModelGenerator modelGenerator, Block block) { - modelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(block) - .coordinate(BlockStateVariantMap.create(Properties.AGE_7) - .register(age -> BlockStateVariant.create() - .put(VariantSettings.MODEL, Unicopia.id("block/apple_sprout_stage" + age))))); } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/FireModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/FireModels.java new file mode 100644 index 00000000..bfe74842 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/FireModels.java @@ -0,0 +1,33 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.List; +import java.util.function.UnaryOperator; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import net.minecraft.block.Block; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.MultipartBlockStateSupplier; +import net.minecraft.data.client.VariantSettings; +import net.minecraft.util.Identifier; + +final class FireModels { + static void registerSoulFire(BlockStateModelGenerator modelGenerator, Block fire, Block texture) { + List floorModels = getFireModels(modelGenerator, texture, "_floor").toList(); + List sideModels = Stream.concat( + getFireModels(modelGenerator, texture, "_side"), + getFireModels(modelGenerator, texture, "_side_alt") + ).toList(); + modelGenerator.blockStateCollector.accept(MultipartBlockStateSupplier.create(fire) + .with(BlockStateModelGenerator.buildBlockStateVariants(floorModels, UnaryOperator.identity())) + .with(BlockStateModelGenerator.buildBlockStateVariants(sideModels, UnaryOperator.identity())) + .with(BlockStateModelGenerator.buildBlockStateVariants(sideModels, blockStateVariant -> blockStateVariant.put(VariantSettings.Y, VariantSettings.Rotation.R90))) + .with(BlockStateModelGenerator.buildBlockStateVariants(sideModels, blockStateVariant -> blockStateVariant.put(VariantSettings.Y, VariantSettings.Rotation.R180))) + .with(BlockStateModelGenerator.buildBlockStateVariants(sideModels, blockStateVariant -> blockStateVariant.put(VariantSettings.Y, VariantSettings.Rotation.R270)))); + } + + private static Stream getFireModels(BlockStateModelGenerator modelGenerator, Block texture, String midfix) { + return IntStream.range(0, 2).mapToObj(i -> ModelIds.getBlockSubModelId(texture, midfix + i)); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java index 37c260f0..88863bb7 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java @@ -19,7 +19,9 @@ import net.minecraft.util.Identifier; interface ItemModels { Model GENERATED = net.minecraft.data.client.Models.GENERATED; Model CHEST = item(new Identifier("chest"), TextureKey.PARTICLE); + Model BUILTIN_ENTITY = new Model(Optional.of(new Identifier("builtin/entity")), Optional.empty()); Model TEMPLATE_AMULET = item("template_amulet", TextureKey.LAYER0); + Model TEMPLATE_EYEWEAR = item("template_eyewear", TextureKey.LAYER0); Model TEMPLATE_SPAWN_EGG = item(new Identifier("template_spawn_egg")); Model TEMPLATE_MUG = item("template_mug", TextureKey.LAYER0); Model HANDHELD_STAFF = item("handheld_staff", TextureKey.LAYER0); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java new file mode 100644 index 00000000..fe4b4e18 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -0,0 +1,447 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.BiConsumer; +import com.minelittlepony.unicopia.Unicopia; +import com.minelittlepony.unicopia.block.EdibleBlock; +import com.minelittlepony.unicopia.block.FruitBearingBlock; +import com.minelittlepony.unicopia.block.PieBlock; +import com.minelittlepony.unicopia.block.PileBlock; +import com.minelittlepony.unicopia.block.ShellsBlock; +import com.minelittlepony.unicopia.block.SlimePustuleBlock; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; +import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.server.world.Tree; + +import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateVariant; +import net.minecraft.data.client.BlockStateVariantMap; +import net.minecraft.data.client.Model; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.Models; +import net.minecraft.data.client.MultipartBlockStateSupplier; +import net.minecraft.data.client.TextureKey; +import net.minecraft.data.client.TextureMap; +import net.minecraft.data.client.TexturedModel; +import net.minecraft.data.client.VariantSettings; +import net.minecraft.data.client.VariantsBlockStateSupplier; +import net.minecraft.data.client.When; +import net.minecraft.data.family.BlockFamily; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; +import net.minecraft.util.Identifier; +import net.minecraft.util.Pair; +import net.minecraft.util.StringIdentifiable; +import net.minecraft.util.math.Direction; + +public class UBlockStateModelGenerator extends BlockStateModelGenerator { + static final Identifier AIR_BLOCK_ID = new Identifier("block/air"); + static final Identifier AIR_ITEM_ID = new Identifier("item/air"); + + static UBlockStateModelGenerator create(BlockStateModelGenerator modelGenerator) { + return new UBlockStateModelGenerator(modelGenerator); + } + + private UBlockStateModelGenerator(BlockStateModelGenerator modelGenerator) { + super(modelGenerator.blockStateCollector, + (id, jsonSupplier) -> { + if (AIR_BLOCK_ID.equals(id) || AIR_ITEM_ID.equals(id)) { + throw new IllegalStateException("Registered air id for block model: " + jsonSupplier.get().toString()); + } + modelGenerator.modelCollector.accept(id, jsonSupplier); + }, + item -> modelGenerator.excludeFromSimpleItemModelGeneration(Block.getBlockFromItem(item)) + ); + + for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { + Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelCollector); + } + } + + @Override + public void register() { + // handmade + registerAll((g, block) -> g.registerParentedItemModel(block, ModelIds.getBlockModelId(block)), UBlocks.SHAPING_BENCH, UBlocks.SURFACE_CHITIN); + registerAll(UBlockStateModelGenerator::registerSimpleState, UBlocks.SHAPING_BENCH, UBlocks.BANANAS); + // doors + registerAll(UBlockStateModelGenerator::registerDoor, UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR); + + // cloud blocks + createCustomTexturePool(UBlocks.CLOUD, TexturedModel.CUBE_ALL).same(UBlocks.UNSTABLE_CLOUD).slab(UBlocks.CLOUD_SLAB).stairs(UBlocks.CLOUD_STAIRS); + createCustomTexturePool(UBlocks.ETCHED_CLOUD, TexturedModel.CUBE_ALL).slab(UBlocks.ETCHED_CLOUD_SLAB).stairs(UBlocks.ETCHED_CLOUD_STAIRS); + createCustomTexturePool(UBlocks.DENSE_CLOUD, TexturedModel.CUBE_ALL).slab(UBlocks.DENSE_CLOUD_SLAB).stairs(UBlocks.DENSE_CLOUD_STAIRS); + createCustomTexturePool(UBlocks.CLOUD_PLANKS, TexturedModel.CUBE_ALL).slab(UBlocks.CLOUD_PLANK_SLAB).stairs(UBlocks.CLOUD_PLANK_STAIRS); + createCustomTexturePool(UBlocks.CLOUD_BRICKS, TexturedModel.CUBE_ALL).slab(UBlocks.CLOUD_BRICK_SLAB).stairs(UBlocks.CLOUD_BRICK_STAIRS); + createTwoStepTexturePool(UBlocks.SOGGY_CLOUD, TexturedModel.CUBE_BOTTOM_TOP.andThen(textures -> textures.put(TextureKey.BOTTOM, ModelIds.getBlockModelId(UBlocks.CLOUD)))).slab(UBlocks.SOGGY_CLOUD_SLAB).stairs(UBlocks.SOGGY_CLOUD_STAIRS); + registerRotated(UBlocks.CARVED_CLOUD, TexturedModel.CUBE_COLUMN); + + registerAll(UBlockStateModelGenerator::registerCompactedBlock, UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_DENSE_CLOUD, UBlocks.COMPACTED_ETCHED_CLOUD); + registerChest(UBlocks.CLOUD_CHEST, UBlocks.CLOUD); + registerFancyBed(UBlocks.CLOUD_BED, UBlocks.CLOUD); + registerFancyBed(UBlocks.CLOTH_BED, Blocks.SPRUCE_PLANKS); + + // chitin blocks + registerTopsoil(UBlocks.SURFACE_CHITIN, UBlocks.CHITIN); + registerHollow(UBlocks.CHITIN); + registerCubeAllModelTexturePool(UBlocks.CHISELLED_CHITIN).stairs(UBlocks.CHISELLED_CHITIN_STAIRS).slab(UBlocks.CHISELLED_CHITIN_SLAB); + registerHiveBlock(UBlocks.HIVE); + registerRotated(UBlocks.CHITIN_SPIKES, BlockModels.SPIKES); + registerHull(UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHITIN, UBlocks.CHISELLED_CHITIN); + registerParentedItemModel(UBlocks.SLIME_PUSTULE, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_pod")); + blockStateCollector.accept(VariantsBlockStateSupplier.create(UBlocks.SLIME_PUSTULE) + .coordinate(BlockStateVariantMap.create(SlimePustuleBlock.SHAPE) + .register(state -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_" + state.asString()))))); + registerPie(UBlocks.APPLE_PIE); + + // palm wood + registerLog(UBlocks.PALM_LOG).log(UBlocks.PALM_LOG).wood(UBlocks.PALM_WOOD); + registerLog(UBlocks.STRIPPED_PALM_LOG).log(UBlocks.STRIPPED_PALM_LOG).wood(UBlocks.STRIPPED_PALM_WOOD); + registerCubeAllModelTexturePool(UBlocks.PALM_PLANKS).family(new BlockFamily.Builder(UBlocks.PALM_PLANKS) + .slab(UBlocks.PALM_SLAB).stairs(UBlocks.PALM_STAIRS).fence(UBlocks.PALM_FENCE).fenceGate(UBlocks.PALM_FENCE_GATE) + .button(UBlocks.PALM_BUTTON).pressurePlate(UBlocks.PALM_PRESSURE_PLATE).sign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN) + .door(UBlocks.PALM_DOOR).trapdoor(UBlocks.PALM_TRAPDOOR) + .group("wooden").unlockCriterionName("has_planks") + .build()); + registerHangingSign(UBlocks.STRIPPED_PALM_LOG, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); + registerSimpleCubeAll(UBlocks.PALM_LEAVES); + + // zap wood + registerLog(UBlocks.ZAP_LOG) + .log(UBlocks.ZAP_LOG).wood(UBlocks.ZAP_WOOD) + .log(UBlocks.WAXED_ZAP_LOG).wood(UBlocks.WAXED_ZAP_WOOD); + registerLog(UBlocks.STRIPPED_ZAP_LOG) + .log(UBlocks.STRIPPED_ZAP_LOG).wood(UBlocks.STRIPPED_ZAP_WOOD) + .log(UBlocks.WAXED_STRIPPED_ZAP_LOG).wood(UBlocks.WAXED_STRIPPED_ZAP_WOOD); + registerCubeAllModelTexturePool(UBlocks.ZAP_PLANKS) + .family(new BlockFamily.Builder(UBlocks.ZAP_PLANKS) + .slab(UBlocks.ZAP_SLAB).stairs(UBlocks.ZAP_STAIRS).fence(UBlocks.ZAP_FENCE).fenceGate(UBlocks.ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build()) + .same(UBlocks.WAXED_ZAP_PLANKS).family(new BlockFamily.Builder(UBlocks.WAXED_ZAP_PLANKS) + .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build()); + registerZapLeaves(UBlocks.ZAP_LEAVES); + registerSingleton(UBlocks.FLOWERING_ZAP_LEAVES, TexturedModel.LEAVES); + registerStateWithModelReference(UBlocks.ZAP_LEAVES_PLACEHOLDER, Blocks.AIR); + + // golden oak wood + registerSimpleCubeAll(UBlocks.GOLDEN_OAK_LEAVES); + registerLog(UBlocks.GOLDEN_OAK_LOG).log(UBlocks.GOLDEN_OAK_LOG); + + // plants + Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED)); + registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); + registerWithStages(UBlocks.GOLD_ROOT, Properties.AGE_7, BlockModels.CROP, 0, 0, 1, 1, 2, 2, 2, 3); + registerWithStages(UBlocks.OATS, UBlocks.OATS.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + registerWithStages(UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6); + registerWithStages(UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), BlockModels.CROP, 0, 1); + registerTallCrop(UBlocks.PINEAPPLE, Properties.AGE_7, Properties.BLOCK_HALF, + new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, + new int[] { 0, 0, 1, 2, 3, 4, 5, 6 } + ); + registerParentedItemModel(UBlocks.PLUNDER_VINE_BUD, ModelIds.getBlockModelId(UBlocks.PLUNDER_VINE_BUD)); + + // leaves + registerAll(UBlockStateModelGenerator::registerFloweringLeaves, UBlocks.GREEN_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES); + registerAll(UBlockStateModelGenerator::registerSprout, UBlocks.GREEN_APPLE_SPROUT, UBlocks.SOUR_APPLE_SPROUT, UBlocks.SWEET_APPLE_SPROUT, UBlocks.GOLDEN_OAK_SPROUT); + registerStateWithModelReference(UBlocks.MANGO_LEAVES, Blocks.JUNGLE_LEAVES); + registerParentedItemModel(UBlocks.MANGO_LEAVES, ModelIds.getBlockModelId(Blocks.JUNGLE_LEAVES)); + + // fruit + Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, + UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, + UBlocks.MANGO, UItems.MANGO, + UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, + UBlocks.SWEET_APPLE, UItems.SWEET_APPLE, + UBlocks.ZAP_APPLE, UItems.ZAP_APPLE, + UBlocks.ZAP_BULB, UItems.ZAP_BULB + ).forEach((block, item) -> registerSingleton(block, TextureMap.cross(ModelIds.getItemModelId(item)), BlockModels.FRUIT)); + + // bales + registerAll((g, block) -> g.registerBale(Unicopia.id(block.getLeft().getPath().replace("bale", "block")), block.getLeft(), block.getRight()), + new Pair<>(new Identifier("hay_block"), "_top"), + new Pair<>(new Identifier("farmersdelight", "rice_bale"), "_top"), + new Pair<>(new Identifier("farmersdelight", "straw_bale"), "_end") + ); + // shells + registerAll(UBlockStateModelGenerator::registerShell, UBlocks.CLAM_SHELL, UBlocks.TURRET_SHELL, UBlocks.SCALLOP_SHELL); + // other + registerBuiltinWithParticle(UBlocks.WEATHER_VANE, UBlocks.WEATHER_VANE.asItem()); + registerWithStages(UBlocks.FROSTED_OBSIDIAN, Properties.AGE_3, BlockModels.CUBE_ALL, 0, 1, 2, 3); + registerWithStagesBuiltinModels(UBlocks.ROCKS, Properties.AGE_7, 0, 1, 2, 3, 4, 5, 6, 7); + registerWithStagesBuiltinModels(UBlocks.MYSTERIOUS_EGG, PileBlock.COUNT, 1, 2, 3); + excludeFromSimpleItemModelGeneration(UBlocks.MYSTERIOUS_EGG); + FireModels.registerSoulFire(this, UBlocks.SPECTRAL_FIRE, Blocks.SOUL_FIRE); + } + + @SafeVarargs + public final UBlockStateModelGenerator registerAll(BiConsumer register, T... blocks) { + for (T block : blocks) { + register.accept(this, block); + } + return this; + } + + @Override + public void registerParentedItemModel(Block block, Identifier parentModelId) { + Item item = block.asItem(); + if (item != Items.AIR) { + registerParentedItemModel(item, parentModelId); + } + } + + public BlockTexturePool createCustomTexturePool(Block block, TexturedModel.Factory modelFactory) { + final TexturedModel texturedModel = modelFactory.get(block); + final TextureMap textures = texturedModel.getTextures(); + return (new BlockTexturePool(textures) { + @Override + public BlockTexturePool stairs(Block block) { + TextureMap textMap = textures.copyAndAdd(BlockModels.STEP, textures.getTexture(TextureKey.SIDE)); + Identifier inner = BlockModels.INNER_STAIRS.upload(block, textMap, modelCollector); + Identifier straight = BlockModels.STRAIGHT_STAIRS.upload(block, textMap, modelCollector); + Identifier outer = BlockModels.OUTER_STAIRS.upload(block, textMap, modelCollector); + blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(block, inner, straight, outer)); + registerParentedItemModel(block, straight); + return this; + } + }).base(block, texturedModel.getModel()); + } + + public BlockTexturePool createTwoStepTexturePool(Block block, TexturedModel.Factory modelFactory) { + final TexturedModel texturedModel = modelFactory.get(block); + final TextureMap textures = texturedModel.getTextures(); + final Identifier baseModelId = ModelIds.getBlockModelId(block); + final Identifier twoStepTexture = ModelIds.getBlockSubModelId(block, "_slab_side"); + return (new BlockTexturePool(textures) { + @Override + public BlockTexturePool stairs(Block block) { + TextureMap textMap = textures.copyAndAdd(BlockModels.STEP, twoStepTexture); + Identifier inner = BlockModels.INNER_STAIRS.upload(block, textMap, modelCollector); + Identifier straight = BlockModels.STRAIGHT_STAIRS.upload(block, textMap, modelCollector); + Identifier outer = BlockModels.OUTER_STAIRS.upload(block, textMap, modelCollector); + blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(block, inner, straight, outer)); + registerParentedItemModel(block, straight); + return this; + } + + @Override + public BlockTexturePool slab(Block block) { + TextureMap textMap = textures.copyAndAdd(TextureKey.SIDE, twoStepTexture); + Identifier lower = Models.SLAB.upload(block, textMap, modelCollector); + Identifier upper = Models.SLAB_TOP.upload(block, textMap, modelCollector); + blockStateCollector.accept(BlockStateModelGenerator.createSlabBlockState(block, lower, upper, baseModelId)); + registerParentedItemModel(block, lower); + return this; + } + }).base(block, texturedModel.getModel()); + } + + public void registerTopsoil(Block block, Block dirt) { + TexturedModel model = TexturedModel.CUBE_BOTTOM_TOP.get(dirt); + registerTopSoil(block, + model.upload(block, modelCollector), + BlockStateVariant.create().put(VariantSettings.MODEL, Models.CUBE_BOTTOM_TOP.upload(dirt, "_snow", model.getTextures() + .copyAndAdd(TextureKey.SIDE, ModelIds.getBlockSubModelId(dirt, "_side_snow_covered") + ), modelCollector)) + ); + } + + public void registerHollow(Block block) { + Identifier outside = ModelIds.getBlockModelId(UBlocks.CHITIN); + Identifier inside = ModelIds.getBlockSubModelId(UBlocks.CHITIN, "_bottom"); + registerSingleton(UBlocks.CHITIN, new TextureMap() + .put(TextureKey.SIDE, outside) + .put(TextureKey.TOP, outside) + .put(TextureKey.BOTTOM, inside), Models.CUBE_BOTTOM_TOP); + } + + public void registerRotated(Block block, TexturedModel.Factory modelFactory) { + Identifier modelId = modelFactory.get(block).upload(block, modelCollector); + blockStateCollector.accept(VariantsBlockStateSupplier.create(block, BlockStateVariant.create() + .put(VariantSettings.MODEL, modelId)) + .coordinate(createUpDefaultFacingVariantMap())); + } + + public void registerCompactedBlock(Block block) { + for (Model model : BlockModels.FLATTENED_MODELS) { + model.upload(block, TextureMap.all(ModelIds.getBlockModelId(block).withPath(p -> p.replace("compacted_", ""))), modelCollector); + } + MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(block); + for (byte i = 0; i < BlockModels.FLATTENED_MODEL_ROTATIONS.length; i++) { + final BooleanProperty yAxis = (i & 0b100) == 0 ? Properties.DOWN : Properties.UP; + final BooleanProperty xAxis = (i & 0b010) == 0 ? Properties.NORTH: Properties.SOUTH; + final BooleanProperty zAxis = (i & 0b001) == 0 ? Properties.EAST : Properties.WEST; + final VariantSettings.Rotation xRot = yAxis == Properties.DOWN ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R180; + final VariantSettings.Rotation yRot = BlockModels.FLATTENED_MODEL_ROTATIONS[i]; + final String[] suffexes = yRot.ordinal() % 2 == 0 ? BlockModels.FLATTENED_MODEL_SUFFEXES : BlockModels.FLATTENED_MODEL_SUFFEXES_ROT; + for (byte v = 0; v < suffexes.length; v++) { + supplier.with(When.create() + .set(yAxis, (v & 0b100) != 0) + .set(xAxis, (v & 0b010) != 0) + .set(zAxis, (v & 0b001) != 0), BlockStateVariant.create() + .put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v])) + .put(VariantSettings.UVLOCK, true) + .put(VariantSettings.X, xRot) + .put(VariantSettings.Y, yRot) + ); + } + } + blockStateCollector.accept(supplier); + } + + public void registerChest(Block chest, Block particleSource) { + registerBuiltin(ModelIds.getBlockModelId(chest), particleSource).includeWithoutItem(chest); + ItemModels.CHEST.upload(ModelIds.getItemModelId(chest.asItem()), TextureMap.particle(particleSource), modelCollector); + } + + public void registerFancyBed(Block bed, Block particleSource) { + registerBuiltinWithParticle(bed, ModelIds.getBlockModelId(particleSource)); + super.registerBed(bed, particleSource); + } + + public void registerHiveBlock(Block hive) { + Identifier core = ModelIds.getBlockSubModelId(hive, "_core"); + Identifier side = ModelIds.getBlockSubModelId(hive, "_side"); + blockStateCollector.accept(MultipartBlockStateSupplier.create(hive) + .with(BlockStateVariant.create().put(VariantSettings.MODEL, core)) + .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true)) + .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R90)) + .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R180)) + .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R270)) + .with(When.create().set(Properties.DOWN, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.X, VariantSettings.Rotation.R90)) + .with(When.create().set(Properties.UP, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.X, VariantSettings.Rotation.R270))); + Models.CUBE_ALL.upload(ModelIds.getItemModelId(hive.asItem()), TextureMap.all(ModelIds.getBlockSubModelId(hive, "_side")), modelCollector); + } + + public void registerBale(Identifier blockId, Identifier baseBlockId, String endSuffex) { + Identifier top = baseBlockId.withPath(p -> "block/" + p + endSuffex); + Identifier side = baseBlockId.withPath(p -> "block/" + p + "_side"); + TextureMap textures = new TextureMap().put(TextureKey.TOP, top).put(TextureKey.SIDE, side); + + MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(Registries.BLOCK.getOrEmpty(blockId).orElseGet(() -> { + return Registry.register(Registries.BLOCK, blockId, new EdibleBlock(blockId, blockId, false)); + })); + Map uploadedModels = new HashMap<>(); + + for (Direction.Axis axis : Direction.Axis.VALUES) { + for (int i = 0; i < EdibleBlock.SEGMENTS.length; i++) { + BooleanProperty segment = EdibleBlock.SEGMENTS[i]; + segment.getName(); + supplier.with(When.create().set(EdibleBlock.AXIS, axis).set(segment, true), BlockStateVariant.create() + .put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(i, ii -> { + return BlockModels.BALE_MODELS[ii].getLeft().upload(blockId.withPath(p -> "block/" + p + BlockModels.BALE_MODELS[ii].getRight()), textures, modelCollector); + })) + .put(VariantSettings.X, axis == Direction.Axis.Y ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R90) + .put(VariantSettings.Y, axis == Direction.Axis.X ? VariantSettings.Rotation.R90 : VariantSettings.Rotation.R0) + ); + } + } + + blockStateCollector.accept(supplier); + } + + public void registerWithStages(Block crop, Property ageProperty, BlockModels.Factory modelFactory, int ... stages) { + if (ageProperty.getValues().size() != stages.length) { + throw new IllegalArgumentException(); + } + int offset = ageProperty.getValues().iterator().next(); + Int2ObjectOpenHashMap uploadedModels = new Int2ObjectOpenHashMap<>(); + blockStateCollector.accept(VariantsBlockStateSupplier.create(crop) + .coordinate(BlockStateVariantMap.create(ageProperty) + .register(age -> BlockStateVariant.create().put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(stages[age - offset], stage -> { + return modelFactory.upload(crop, "_stage" + stage, modelCollector); + }))))); + } + + public void registerWithStagesBuiltinModels(Block crop, Property ageProperty, int ... stages) { + if (ageProperty.getValues().size() != stages.length) { + throw new IllegalArgumentException(); + } + int offset = ageProperty.getValues().iterator().next(); + blockStateCollector.accept(VariantsBlockStateSupplier.create(crop) + .coordinate(BlockStateVariantMap.create(ageProperty) + .register(age -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(crop, "_stage" + stages[age - offset]))))); + } + + public & StringIdentifiable> void registerTallCrop(Block crop, + Property ageProperty, + EnumProperty partProperty, + int[] ... ageTextureIndices) { + Map uploadedModels = new HashMap<>(); + blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(partProperty, ageProperty).register((part, age) -> { + int i = ageTextureIndices[part.ordinal()][age]; + Identifier identifier = uploadedModels.computeIfAbsent("_" + part.asString() + "_stage" + i, variant -> createSubModel(crop, variant, Models.CROSS, TextureMap::cross)); + return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); + }))); + } + + public void registerPie(Block pie) { + TextureMap textures = new TextureMap() + .put(TextureKey.TOP, ModelIds.getBlockSubModelId(pie, "_top")) + .put(TextureKey.BOTTOM, ModelIds.getBlockSubModelId(pie, "_bottom")) + .put(TextureKey.SIDE, ModelIds.getBlockSubModelId(pie, "_side")) + .put(TextureKey.INSIDE, ModelIds.getBlockSubModelId(pie, "_inside")); + TextureMap stompedTextures = textures.copyAndAdd(TextureKey.TOP, ModelIds.getBlockSubModelId(pie, "_top_stomped")); + blockStateCollector.accept(VariantsBlockStateSupplier.create(pie).coordinate(BlockStateVariantMap.create(PieBlock.BITES, PieBlock.STOMPED).register((bites, stomped) -> { + return BlockStateVariant.create().put(VariantSettings.MODEL, BlockModels.PIE_MODELS[bites].upload(pie, (stomped ? "_stomped" : ""), stomped ? stompedTextures : textures, modelCollector)); + }))); + } + + public void registerFloweringLeaves(Block block) { + Identifier baseModel = TexturedModel.LEAVES.upload(block, modelCollector); + Identifier floweringModel = Models.CUBE_ALL.upload(block, "_flowering", TextureMap.of(TextureKey.ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelCollector); + blockStateCollector.accept(MultipartBlockStateSupplier.create(block) + .with(BlockStateVariant.create().put(VariantSettings.MODEL, baseModel)) + .with(When.create().set(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.FLOWERING), BlockStateVariant.create().put(VariantSettings.MODEL, floweringModel))); + } + + public void registerZapLeaves(Block block) { + Identifier baseModel = TexturedModel.LEAVES.upload(block, modelCollector); + Identifier floweringModel = Registries.BLOCK.getId(block).withPrefixedPath("block/flowering_"); + Identifier airModel = ModelIds.getBlockModelId(Blocks.AIR); + blockStateCollector.accept(VariantsBlockStateSupplier.create(block) + .coordinate(BlockStateVariantMap.create(ZapAppleLeavesBlock.STAGE) + .register(stage -> BlockStateVariant.create() + .put(VariantSettings.MODEL, switch (stage) { + case HIBERNATING -> airModel; + case FLOWERING -> floweringModel; + default -> baseModel; + })))); + } + + public void registerSprout(Block sprout) { + blockStateCollector.accept(VariantsBlockStateSupplier.create(sprout) + .coordinate(BlockStateVariantMap.create(Properties.AGE_7) + .register(age -> BlockStateVariant.create() + .put(VariantSettings.MODEL, Unicopia.id("block/apple_sprout_stage" + age))))); + } + + public void registerShell(Block shell) { + blockStateCollector.accept(VariantsBlockStateSupplier.create(shell) + .coordinate(BlockStateVariantMap.create(ShellsBlock.COUNT) + .register(count -> BlockStateVariant.create() + .put(VariantSettings.MODEL, BlockModels.SHELL_MODELS[count - 1].upload(shell, TextureMap.of(BlockModels.SHELL, Registries.BLOCK.getId(shell).withPrefixedPath("item/")), modelCollector))))); + } + + public void registerHull(Block block, Block core, Block shell) { + blockStateCollector.accept(VariantsBlockStateSupplier.create( + block, + BlockStateVariant.create().put(VariantSettings.MODEL, Models.CUBE_BOTTOM_TOP.upload(block, new TextureMap() + .put(TextureKey.BOTTOM, ModelIds.getBlockModelId(core)) + .put(TextureKey.TOP, ModelIds.getBlockModelId(shell)) + .put(TextureKey.SIDE, ModelIds.getBlockSubModelId(shell, "_half")), modelCollector)) + ).coordinate(createUpDefaultFacingVariantMap())); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 03bc4d22..b864b076 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -1,32 +1,19 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.List; -import java.util.Map; - import com.minelittlepony.unicopia.Race; -import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; -import com.minelittlepony.unicopia.server.world.Tree; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.BlockStateModelGenerator.TintType; -import net.minecraft.data.family.BlockFamily; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.registry.Registries; -import net.minecraft.state.property.Properties; -import net.minecraft.util.Identifier; -import net.minecraft.util.Pair; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.ModelIds; import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; -import net.minecraft.data.client.TexturedModel; public class UModelProvider extends FabricModelProvider { public UModelProvider(FabricDataOutput output) { @@ -34,106 +21,8 @@ public class UModelProvider extends FabricModelProvider { } @Override - public void generateBlockStateModels(BlockStateModelGenerator modelGenerator) { - // cloud blocks - modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD).slab(UBlocks.CLOUD_SLAB);//.stairs(UBlocks.CLOUD_STAIRS); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.ETCHED_CLOUD).slab(UBlocks.ETCHED_CLOUD_SLAB);//.stairs(UBlocks.ETCHED_CLOUD_STAIRS); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.DENSE_CLOUD).slab(UBlocks.DENSE_CLOUD_SLAB);//.stairs(UBlocks.DENSE_CLOUD_STAIRS); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_PLANKS).slab(UBlocks.CLOUD_PLANK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.CLOUD_BRICKS).slab(UBlocks.CLOUD_BRICK_SLAB);//.stairs(UBlocks.CLOUD_PLANK_STAIRS); - - List.of(UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_DENSE_CLOUD, UBlocks.COMPACTED_ETCHED_CLOUD).forEach(block -> { - BlockModels.registerCompactedBlock(modelGenerator, block); - }); - BlockModels.registerChest(modelGenerator, UBlocks.CLOUD_CHEST, UBlocks.CLOUD); - BlockModels.registerBed(modelGenerator, UBlocks.CLOUD_BED, UBlocks.CLOUD); - BlockModels.registerBed(modelGenerator, UBlocks.CLOTH_BED, Blocks.SPRUCE_PLANKS); - - // doors - List.of(UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR).forEach(modelGenerator::registerDoor); - - // chitin blocks - modelGenerator.registerCubeAllModelTexturePool(UBlocks.CHISELLED_CHITIN).stairs(UBlocks.CHISELLED_CHITIN_STAIRS).slab(UBlocks.CHISELLED_CHITIN_SLAB); - - // palm wood - registerLogSet(modelGenerator, UBlocks.PALM_LOG, UBlocks.PALM_WOOD); - registerLogSet(modelGenerator, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.PALM_PLANKS).family(new BlockFamily.Builder(UBlocks.PALM_PLANKS) - .slab(UBlocks.PALM_SLAB).stairs(UBlocks.PALM_STAIRS).fence(UBlocks.PALM_FENCE).fenceGate(UBlocks.PALM_FENCE_GATE) - .button(UBlocks.PALM_BUTTON).pressurePlate(UBlocks.PALM_PRESSURE_PLATE).sign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN) - .door(UBlocks.PALM_DOOR).trapdoor(UBlocks.PALM_TRAPDOOR) - .group("wooden").unlockCriterionName("has_planks") - .build()); - modelGenerator.registerHangingSign(UBlocks.STRIPPED_PALM_LOG, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); - modelGenerator.registerSimpleCubeAll(UBlocks.PALM_LEAVES); - - // zap wood - modelGenerator.registerLog(UBlocks.ZAP_LOG) - .log(UBlocks.ZAP_LOG).wood(UBlocks.ZAP_WOOD) - .log(UBlocks.WAXED_ZAP_LOG).wood(UBlocks.WAXED_ZAP_WOOD); - modelGenerator.registerLog(UBlocks.STRIPPED_ZAP_LOG) - .log(UBlocks.STRIPPED_ZAP_LOG).wood(UBlocks.STRIPPED_ZAP_WOOD) - .log(UBlocks.WAXED_STRIPPED_ZAP_LOG).wood(UBlocks.WAXED_STRIPPED_ZAP_WOOD); - modelGenerator.registerCubeAllModelTexturePool(UBlocks.ZAP_PLANKS) - .family(new BlockFamily.Builder(UBlocks.ZAP_PLANKS) - .slab(UBlocks.ZAP_SLAB).stairs(UBlocks.ZAP_STAIRS).fence(UBlocks.ZAP_FENCE).fenceGate(UBlocks.ZAP_FENCE_GATE) - .group("wooden").unlockCriterionName("has_planks") - .build()) - .same(UBlocks.WAXED_ZAP_PLANKS).family(new BlockFamily.Builder(UBlocks.WAXED_ZAP_PLANKS) - .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) - .group("wooden").unlockCriterionName("has_planks") - .build()); - BlockModels.registerZapLeaves(modelGenerator, UBlocks.ZAP_LEAVES); - modelGenerator.registerSingleton(UBlocks.FLOWERING_ZAP_LEAVES, TexturedModel.LEAVES); - - // golden oak wood - modelGenerator.registerSimpleCubeAll(UBlocks.GOLDEN_OAK_LEAVES); - modelGenerator.registerLog(UBlocks.GOLDEN_OAK_LOG) - .log(UBlocks.GOLDEN_OAK_LOG); - - // plants - Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> { - modelGenerator.registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED); - }); - modelGenerator.registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); - modelGenerator.registerCrop(UBlocks.GOLD_ROOT, Properties.AGE_7, 0, 0, 1, 1, 2, 2, 2, 3); - BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS, UBlocks.OATS.getAgeProperty(), 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); - BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), 0, 1, 2, 3, 4, 5, 6); - BlockModels.registerCropWithoutItem(modelGenerator, UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), 0, 1); - BlockModels.registerTallCrop(modelGenerator, UBlocks.PINEAPPLE, Properties.AGE_7, Properties.BLOCK_HALF, - new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, - new int[] { 0, 0, 1, 2, 3, 4, 5, 6 } - ); - - // leaves - List.of(UBlocks.GREEN_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES).forEach(block -> { - BlockModels.registerFloweringLeaves(modelGenerator, block); - }); - BlockModels.createSproutStages(modelGenerator); - List.of(UBlocks.GREEN_APPLE_SPROUT, UBlocks.SOUR_APPLE_SPROUT, UBlocks.SWEET_APPLE_SPROUT, UBlocks.GOLDEN_OAK_SPROUT).forEach(block -> { - BlockModels.registerSprout(modelGenerator, block); - }); - - // fruit - Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, - UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, - UBlocks.MANGO, UItems.MANGO, - UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, - UBlocks.SWEET_APPLE, UItems.SWEET_APPLE, - UBlocks.ZAP_APPLE, UItems.ZAP_APPLE, - UBlocks.ZAP_BULB, UItems.ZAP_BULB - ).forEach((block, item) -> { - modelGenerator.registerSingleton(block, TextureMap.cross(Registries.ITEM.getId(item).withPrefixedPath("item/")), BlockModels.FRUIT); - }); - - // bales - List.of( - new Pair<>(new Identifier("hay_block"), "_top"), - new Pair<>(new Identifier("farmersdelight", "rice_bale"), "_top"), - new Pair<>(new Identifier("farmersdelight", "straw_bale"), "_end") - ).forEach(block -> { - BlockModels.registerBale(modelGenerator, Unicopia.id(block.getLeft().getPath().replace("bale", "block")), block.getLeft(), block.getRight()); - }); + public void generateBlockStateModels(BlockStateModelGenerator modelGenerator0) { + UBlockStateModelGenerator.create(modelGenerator0).register(); } @Override @@ -141,7 +30,7 @@ public class UModelProvider extends FabricModelProvider { ItemModels.register(itemModelGenerator, UItems.ACORN, UItems.APPLE_PIE_HOOF, UItems.APPLE_PIE_SLICE, UItems.APPLE_PIE, UItems.BANANA, UItems.BOTCHED_GEM, UItems.BROKEN_SUNGLASSES, UItems.BURNED_JUICE, UItems.BURNED_TOAST, - UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, + UItems.CARAPACE, UItems.CLAM_SHELL, UItems.COOKED_ZAP_APPLE, UItems.CLOUD_LUMP, UItems.CRISPY_HAY_FRIES, UItems.CRYSTAL_HEART, UItems.CRYSTAL_SHARD, UItems.DAFFODIL_DAISY_SANDWICH, UItems.DRAGON_BREATH_SCROLL, UItems.EMPTY_JAR, UItems.FRIENDSHIP_BRACELET, @@ -158,52 +47,37 @@ public class UModelProvider extends FabricModelProvider { UItems.SALT_CUBE, UItems.SCALLOP_SHELL, UItems.SHELLY, UItems.SOUR_APPLE_SEEDS, UItems.SOUR_APPLE, UItems.SPELLBOOK, UItems.STORM_CLOUD_JAR, UItems.SWEET_APPLE_SEEDS, UItems.SWEET_APPLE, UItems.TOAST, UItems.TOM, UItems.TURRET_SHELL, - UItems.WEIRD_ROCK, UItems.WHEAT_WORMS, + UItems.WEIRD_ROCK, UItems.WHEAT_WORMS, UBlocks.WEATHER_VANE.asItem(), UItems.ZAP_APPLE_JAM_JAR, UItems.ZAP_APPLE, UItems.ZAP_BULB, - // discs UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR, - // baskets UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, UItems.DARK_OAK_BASKET, UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.SPRUCE_BASKET, UItems.PALM_BASKET, - // boats UItems.PALM_BOAT, UItems.PALM_CHEST_BOAT, - // horseshoes UItems.COPPER_HORSE_SHOE, UItems.GOLDEN_HORSE_SHOE, UItems.IRON_HORSE_SHOE, UItems.NETHERITE_HORSE_SHOE ); - // spawn eggs - ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_SPAWN_EGG, - UItems.BUTTERFLY_SPAWN_EGG, UItems.LOOT_BUG_SPAWN_EGG - ); - + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_SPAWN_EGG, UItems.BUTTERFLY_SPAWN_EGG, UItems.LOOT_BUG_SPAWN_EGG); // amulets - ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_AMULET, - UItems.ALICORN_AMULET, UItems.BROKEN_ALICORN_AMULET, UItems.PEARL_NECKLACE, UItems.PEGASUS_AMULET, UItems.UNICORN_AMULET - ); - + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_AMULET, UItems.ALICORN_AMULET, UItems.BROKEN_ALICORN_AMULET, UItems.PEARL_NECKLACE, UItems.PEGASUS_AMULET, UItems.UNICORN_AMULET); // mugs - ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_MUG, - UItems.CIDER, UItems.LOVE_BOTTLE, UItems.LOVE_BUCKET, UItems.LOVE_MUG, UItems.MUG - ); - + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_MUG, UItems.CIDER, UItems.LOVE_BOTTLE, UItems.LOVE_BUCKET, UItems.LOVE_MUG, UItems.MUG); + // jars + ItemModels.register(itemModelGenerator, ItemModels.BUILTIN_ENTITY, UItems.FILLED_JAR); + // eyewear + ItemModels.register(itemModelGenerator, ItemModels.TEMPLATE_EYEWEAR, UItems.SUNGLASSES); // staffs - ItemModels.register(itemModelGenerator, ItemModels.HANDHELD_STAFF, - UItems.MEADOWBROOKS_STAFF - ); + ItemModels.register(itemModelGenerator, ItemModels.HANDHELD_STAFF, UItems.MEADOWBROOKS_STAFF); ItemModels.item("handheld_staff", TextureKey.LAYER0, TextureKey.LAYER1).upload(ModelIds.getItemModelId(UItems.MAGIC_STAFF), new TextureMap() .put(TextureKey.LAYER0, ModelIds.getItemSubModelId(UItems.MAGIC_STAFF, "_base")) .put(TextureKey.LAYER1, ModelIds.getItemSubModelId(UItems.MAGIC_STAFF, "_magic")), itemModelGenerator.writer); // polearms - List.of(UItems.DIAMOND_POLEARM, UItems.GOLDEN_POLEARM, UItems.NETHERITE_POLEARM, UItems.STONE_POLEARM, UItems.WOODEN_POLEARM, UItems.IRON_POLEARM).forEach(item -> { - ItemModels.registerPolearm(itemModelGenerator, item); - }); - + List.of(UItems.DIAMOND_POLEARM, UItems.GOLDEN_POLEARM, UItems.NETHERITE_POLEARM, UItems.STONE_POLEARM, UItems.WOODEN_POLEARM, UItems.IRON_POLEARM).forEach(item -> ItemModels.registerPolearm(itemModelGenerator, item)); // sheets ItemModels.register(itemModelGenerator, BedsheetsItem.ITEMS.values().stream().toArray(Item[]::new)); // badges @@ -212,6 +86,7 @@ public class UModelProvider extends FabricModelProvider { .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) .toArray(Item[]::new)); + // butterflies ItemModels.registerButterfly(itemModelGenerator, UItems.BUTTERFLY); ItemModels.registerSpectralBlock(itemModelGenerator, UItems.SPECTRAL_CLOCK); ModelOverrides.of(ItemModels.GENERATED) @@ -224,16 +99,11 @@ public class UModelProvider extends FabricModelProvider { .addOverride(ModelIds.getItemSubModelId(item, "_bite2"), "damage", 0.6F) .upload(item, itemModelGenerator); }); - } - private void registerLogSet(BlockStateModelGenerator modelGenerator, Block log, Block wood) { - modelGenerator.registerLog(log).log(log).wood(wood); - } - - public void registerParentedAxisRotatedCubeColumn(BlockStateModelGenerator modelGenerator, Block modelSource, Block child) { - Identifier vertical = ModelIds.getBlockModelId(modelSource); - Identifier horizontal = ModelIds.getBlockSubModelId(modelSource, "_horizontal"); - modelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createAxisRotatedBlockState(child, vertical, horizontal)); - modelGenerator.registerParentedItemModel(child, vertical); + // gemstone + ModelOverrides.of(ItemModels.GENERATED) + .addOverride(ModelIds.getItemSubModelId(UItems.GEMSTONE, "_pure"), "affinity", 0) + .addOverride(ModelIds.getItemSubModelId(UItems.GEMSTONE, "_corrupted"), "affinity", 1) + .upload(UItems.GEMSTONE, itemModelGenerator); } } diff --git a/src/main/resources/assets/unicopia/blockstates/apple_pie.json b/src/main/resources/assets/unicopia/blockstates/apple_pie.json deleted file mode 100644 index 2fc74d17..00000000 --- a/src/main/resources/assets/unicopia/blockstates/apple_pie.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "bites=0,stomped=false": { "model": "unicopia:block/apple_pie" }, - "bites=1,stomped=false": { "model": "unicopia:block/apple_pie_elbow" }, - "bites=2,stomped=false": { "model": "unicopia:block/apple_pie_straight" }, - "bites=3,stomped=false": { "model": "unicopia:block/apple_pie_corner" }, - "bites=0,stomped=true": { "model": "unicopia:block/stomped_apple_pie" }, - "bites=1,stomped=true": { "model": "unicopia:block/stomped_apple_pie_elbow" }, - "bites=2,stomped=true": { "model": "unicopia:block/stomped_apple_pie_straight" }, - "bites=3,stomped=true": { "model": "unicopia:block/stomped_apple_pie_corner" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/bananas.json b/src/main/resources/assets/unicopia/blockstates/bananas.json deleted file mode 100644 index 3e967654..00000000 --- a/src/main/resources/assets/unicopia/blockstates/bananas.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/bananas" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/carved_cloud.json b/src/main/resources/assets/unicopia/blockstates/carved_cloud.json deleted file mode 100644 index e2a29a8c..00000000 --- a/src/main/resources/assets/unicopia/blockstates/carved_cloud.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up": { "model": "unicopia:block/carved_cloud" }, - "facing=down": { "model": "unicopia:block/carved_cloud", "x": 180 }, - "facing=north": { "model": "unicopia:block/carved_cloud", "x": 90 }, - "facing=south": { "model": "unicopia:block/carved_cloud", "x": -90 }, - "facing=east": { "model": "unicopia:block/carved_cloud", "x": 90, "y": 90 }, - "facing=west": { "model": "unicopia:block/carved_cloud", "x": 90, "y": -90 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_hull.json b/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_hull.json deleted file mode 100644 index 029574bf..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chiselled_chitin_hull.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up": { "model": "unicopia:block/chiselled_chitin_hull" }, - "facing=down": { "model": "unicopia:block/chiselled_chitin_hull", "x": 180 }, - "facing=north": { "model": "unicopia:block/chiselled_chitin_hull", "x": 90 }, - "facing=south": { "model": "unicopia:block/chiselled_chitin_hull", "x": -90 }, - "facing=east": { "model": "unicopia:block/chiselled_chitin_hull", "x": 90, "y": 90 }, - "facing=west": { "model": "unicopia:block/chiselled_chitin_hull", "x": 90, "y": -90 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/chitin.json b/src/main/resources/assets/unicopia/blockstates/chitin.json deleted file mode 100644 index 8fac9db2..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chitin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/chitin" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/chitin_spikes.json b/src/main/resources/assets/unicopia/blockstates/chitin_spikes.json deleted file mode 100644 index 2a1cb8a5..00000000 --- a/src/main/resources/assets/unicopia/blockstates/chitin_spikes.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=up": { "model": "unicopia:block/chitin_spikes" }, - "facing=down": { "model": "unicopia:block/chitin_spikes", "x": 180 }, - "facing=north": { "model": "unicopia:block/chitin_spikes", "x": 90 }, - "facing=south": { "model": "unicopia:block/chitin_spikes", "x": -90 }, - "facing=east": { "model": "unicopia:block/chitin_spikes", "x": 90, "y": 90 }, - "facing=west": { "model": "unicopia:block/chitin_spikes", "x": 90, "y": -90 } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/clam_shell.json b/src/main/resources/assets/unicopia/blockstates/clam_shell.json deleted file mode 100644 index 9efb55d9..00000000 --- a/src/main/resources/assets/unicopia/blockstates/clam_shell.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "count=1": { "model": "unicopia:block/clam_shell_1" }, - "count=2": { "model": "unicopia:block/clam_shell_2" }, - "count=3": { "model": "unicopia:block/clam_shell_3" }, - "count=4": { "model": "unicopia:block/clam_shell_4" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_brick_stairs.json b/src/main/resources/assets/unicopia/blockstates/cloud_brick_stairs.json deleted file mode 100644 index 270e717e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_brick_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_brick_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_brick_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/cloud_brick_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_plank_stairs.json b/src/main/resources/assets/unicopia/blockstates/cloud_plank_stairs.json deleted file mode 100644 index 1e0882f0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_plank_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_plank_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_plank_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/cloud_plank_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json deleted file mode 100644 index f5f2770e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/cloud_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json deleted file mode 100644 index c4e5777e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/dense_cloud_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/dense_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/dense_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/dense_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/etched_cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/etched_cloud_stairs.json deleted file mode 100644 index e8a09622..00000000 --- a/src/main/resources/assets/unicopia/blockstates/etched_cloud_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/etched_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/etched_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/etched_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/frosted_obsidian.json b/src/main/resources/assets/unicopia/blockstates/frosted_obsidian.json deleted file mode 100644 index 394f2d3e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/frosted_obsidian.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/frosted_obsidian_0" - }, - "age=1": { - "model": "unicopia:block/frosted_obsidian_1" - }, - "age=2": { - "model": "unicopia:block/frosted_obsidian_2" - }, - "age=3": { - "model": "unicopia:block/frosted_obsidian_3" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/hive.json b/src/main/resources/assets/unicopia/blockstates/hive.json deleted file mode 100644 index e363894a..00000000 --- a/src/main/resources/assets/unicopia/blockstates/hive.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "unicopia:block/hive_core" - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true - }, - "when": { - "north": true - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": true - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": true - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": true - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true, - "x": 90 - }, - "when": { - "down": true - } - }, - { - "apply": { - "model": "unicopia:block/hive_side", - "uvlock": true, - "x": 270 - }, - "when": { - "up": true - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/mango_leaves.json b/src/main/resources/assets/unicopia/blockstates/mango_leaves.json deleted file mode 100644 index b0cd81cb..00000000 --- a/src/main/resources/assets/unicopia/blockstates/mango_leaves.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "minecraft:block/jungle_leaves" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/mysterious_egg.json b/src/main/resources/assets/unicopia/blockstates/mysterious_egg.json deleted file mode 100644 index d175b41c..00000000 --- a/src/main/resources/assets/unicopia/blockstates/mysterious_egg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "count=1": { "model": "unicopia:block/mysterious_egg_1" }, - "count=2": { "model": "unicopia:block/mysterious_egg_2" }, - "count=3": { "model": "unicopia:block/mysterious_egg_3" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/rocks.json b/src/main/resources/assets/unicopia/blockstates/rocks.json deleted file mode 100644 index 67c465f4..00000000 --- a/src/main/resources/assets/unicopia/blockstates/rocks.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "age=0": { - "model": "unicopia:block/rocks_stage0" - }, - "age=1": { - "model": "unicopia:block/rocks_stage1" - }, - "age=2": { - "model": "unicopia:block/rocks_stage2" - }, - "age=3": { - "model": "unicopia:block/rocks_stage3" - }, - "age=4": { - "model": "unicopia:block/rocks_stage4" - }, - "age=5": { - "model": "unicopia:block/rocks_stage5" - }, - "age=6": { - "model": "unicopia:block/rocks_stage6" - }, - "age=7": { - "model": "unicopia:block/rocks_stage7" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/scallop_shell.json b/src/main/resources/assets/unicopia/blockstates/scallop_shell.json deleted file mode 100644 index 92a7659f..00000000 --- a/src/main/resources/assets/unicopia/blockstates/scallop_shell.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "count=1": { "model": "unicopia:block/scallop_shell_1" }, - "count=2": { "model": "unicopia:block/scallop_shell_2" }, - "count=3": { "model": "unicopia:block/scallop_shell_3" }, - "count=4": { "model": "unicopia:block/scallop_shell_4" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/shaping_bench.json b/src/main/resources/assets/unicopia/blockstates/shaping_bench.json deleted file mode 100644 index fb0ebd3e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/shaping_bench.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "unicopia:block/shaping_bench" - } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/slime_pustule.json b/src/main/resources/assets/unicopia/blockstates/slime_pustule.json deleted file mode 100644 index a15be870..00000000 --- a/src/main/resources/assets/unicopia/blockstates/slime_pustule.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "shape=drip": { "model": "unicopia:block/slime_pustule_drip" }, - "shape=cap": { "model": "unicopia:block/slime_pustule_cap" }, - "shape=string": { "model": "unicopia:block/slime_pustule_rope" }, - "shape=pod": { "model": "unicopia:block/slime_pustule_pod" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/soggy_cloud.json b/src/main/resources/assets/unicopia/blockstates/soggy_cloud.json deleted file mode 100644 index 2a3c83f4..00000000 --- a/src/main/resources/assets/unicopia/blockstates/soggy_cloud.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/soggy_cloud" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/soggy_cloud_slab.json b/src/main/resources/assets/unicopia/blockstates/soggy_cloud_slab.json deleted file mode 100644 index 1df56d0e..00000000 --- a/src/main/resources/assets/unicopia/blockstates/soggy_cloud_slab.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "type=double": { "model": "unicopia:block/soggy_cloud" }, - "type=bottom": { "model": "unicopia:block/soggy_cloud_slab" }, - "type=top": { "model": "unicopia:block/soggy_cloud_slab_top" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/soggy_cloud_stairs.json b/src/main/resources/assets/unicopia/blockstates/soggy_cloud_stairs.json deleted file mode 100644 index 7ab311d3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/soggy_cloud_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "unicopia:block/soggy_cloud_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "unicopia:block/soggy_cloud_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "unicopia:block/soggy_cloud_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/spectral_fire.json b/src/main/resources/assets/unicopia/blockstates/spectral_fire.json deleted file mode 100644 index bd637a77..00000000 --- a/src/main/resources/assets/unicopia/blockstates/spectral_fire.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "multipart": [ - { - "apply": [ - { - "model": "minecraft:block/soul_fire_floor0" - }, - { - "model": "minecraft:block/soul_fire_floor1" - } - ] - }, - { - "apply": [ - { - "model": "minecraft:block/soul_fire_side0" - }, - { - "model": "minecraft:block/soul_fire_side1" - }, - { - "model": "minecraft:block/soul_fire_side_alt0" - }, - { - "model": "minecraft:block/soul_fire_side_alt1" - } - ] - }, - { - "apply": [ - { - "model": "minecraft:block/soul_fire_side0", - "y": 90 - }, - { - "model": "minecraft:block/soul_fire_side1", - "y": 90 - }, - { - "model": "minecraft:block/soul_fire_side_alt0", - "y": 90 - }, - { - "model": "minecraft:block/soul_fire_side_alt1", - "y": 90 - } - ] - }, - { - "apply": [ - { - "model": "minecraft:block/soul_fire_side0", - "y": 180 - }, - { - "model": "minecraft:block/soul_fire_side1", - "y": 180 - }, - { - "model": "minecraft:block/soul_fire_side_alt0", - "y": 180 - }, - { - "model": "minecraft:block/soul_fire_side_alt1", - "y": 180 - } - ] - }, - { - "apply": [ - { - "model": "minecraft:block/soul_fire_side0", - "y": 270 - }, - { - "model": "minecraft:block/soul_fire_side1", - "y": 270 - }, - { - "model": "minecraft:block/soul_fire_side_alt0", - "y": 270 - }, - { - "model": "minecraft:block/soul_fire_side_alt1", - "y": 270 - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/surface_chitin.json b/src/main/resources/assets/unicopia/blockstates/surface_chitin.json deleted file mode 100644 index 4e5765a5..00000000 --- a/src/main/resources/assets/unicopia/blockstates/surface_chitin.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "snowy=false": { "model": "unicopia:block/surface_chitin" }, - "snowy=true": { "model": "unicopia:block/surface_chitin_snowy" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/turret_shell.json b/src/main/resources/assets/unicopia/blockstates/turret_shell.json deleted file mode 100644 index e7388398..00000000 --- a/src/main/resources/assets/unicopia/blockstates/turret_shell.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "count=1": { "model": "unicopia:block/turret_shell_1" }, - "count=2": { "model": "unicopia:block/turret_shell_2" }, - "count=3": { "model": "unicopia:block/turret_shell_3" }, - "count=4": { "model": "unicopia:block/turret_shell_4" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/unstable_cloud.json b/src/main/resources/assets/unicopia/blockstates/unstable_cloud.json deleted file mode 100644 index 3afda0a3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/unstable_cloud.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/cloud" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/weather_vane.json b/src/main/resources/assets/unicopia/blockstates/weather_vane.json deleted file mode 100644 index e4a9f4e3..00000000 --- a/src/main/resources/assets/unicopia/blockstates/weather_vane.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "unicopia:block/weather_vane" } - } -} diff --git a/src/main/resources/assets/unicopia/blockstates/zap_leaves_placeholder.json b/src/main/resources/assets/unicopia/blockstates/zap_leaves_placeholder.json deleted file mode 100644 index 2c8f02f0..00000000 --- a/src/main/resources/assets/unicopia/blockstates/zap_leaves_placeholder.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "minecraft:block/air" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/apple_pie.json b/src/main/resources/assets/unicopia/models/block/apple_pie.json deleted file mode 100644 index cce9c5dc..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_pie.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_full", - "textures": { - "top": "unicopia:block/apple_pie_top", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/apple_pie_corner.json b/src/main/resources/assets/unicopia/models/block/apple_pie_corner.json deleted file mode 100644 index 835b7dd4..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_pie_corner.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_corner", - "textures": { - "top": "unicopia:block/apple_pie_top", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/apple_pie_elbow.json b/src/main/resources/assets/unicopia/models/block/apple_pie_elbow.json deleted file mode 100644 index 553cc1c4..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_pie_elbow.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_elbow", - "textures": { - "top": "unicopia:block/apple_pie_top", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/apple_pie_straight.json b/src/main/resources/assets/unicopia/models/block/apple_pie_straight.json deleted file mode 100644 index b81849a0..00000000 --- a/src/main/resources/assets/unicopia/models/block/apple_pie_straight.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_straight", - "textures": { - "top": "unicopia:block/apple_pie_top", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/carved_cloud.json b/src/main/resources/assets/unicopia/models/block/carved_cloud.json deleted file mode 100644 index 3865501f..00000000 --- a/src/main/resources/assets/unicopia/models/block/carved_cloud.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/carved_cloud_top", - "top": "unicopia:block/carved_cloud_top", - "side": "unicopia:block/carved_cloud" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_hull.json b/src/main/resources/assets/unicopia/models/block/chiselled_chitin_hull.json deleted file mode 100644 index 1cd1744f..00000000 --- a/src/main/resources/assets/unicopia/models/block/chiselled_chitin_hull.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/chitin", - "top": "unicopia:block/chiselled_chitin", - "side": "unicopia:block/chiselled_chitin_half" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chitin.json b/src/main/resources/assets/unicopia/models/block/chitin.json deleted file mode 100644 index 7771bdc7..00000000 --- a/src/main/resources/assets/unicopia/models/block/chitin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/chitin_bottom", - "top": "unicopia:block/chitin", - "side": "unicopia:block/chitin" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/chitin_spikes.json b/src/main/resources/assets/unicopia/models/block/chitin_spikes.json deleted file mode 100644 index ebd5e03e..00000000 --- a/src/main/resources/assets/unicopia/models/block/chitin_spikes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/crop", - "textures": { - "crop": "unicopia:block/chitin_spikes" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs.json b/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs.json deleted file mode 100644 index 83922596..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs", - "textures": { - "bottom": "unicopia:block/cloud_bricks", - "side": "unicopia:block/cloud_bricks", - "top": "unicopia:block/cloud_bricks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_inner.json deleted file mode 100644 index b523f247..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_inner", - "textures": { - "bottom": "unicopia:block/cloud_bricks", - "side": "unicopia:block/cloud_bricks", - "top": "unicopia:block/cloud_bricks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_outer.json deleted file mode 100644 index adecbca0..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_outer", - "textures": { - "bottom": "unicopia:block/cloud_bricks", - "side": "unicopia:block/cloud_bricks", - "top": "unicopia:block/cloud_bricks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs.json b/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs.json deleted file mode 100644 index 62e27d8c..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs", - "textures": { - "bottom": "unicopia:block/cloud_planks", - "side": "unicopia:block/cloud_planks", - "top": "unicopia:block/cloud_planks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_inner.json deleted file mode 100644 index a896bde3..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_inner", - "textures": { - "bottom": "unicopia:block/cloud_planks", - "side": "unicopia:block/cloud_planks", - "top": "unicopia:block/cloud_planks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_outer.json deleted file mode 100644 index b5c9e19a..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_plank_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_outer", - "textures": { - "bottom": "unicopia:block/cloud_planks", - "side": "unicopia:block/cloud_planks", - "top": "unicopia:block/cloud_planks" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json deleted file mode 100644 index aa9b731c..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs", - "textures": { - "bottom": "unicopia:block/dense_cloud", - "side": "unicopia:block/dense_cloud", - "top": "unicopia:block/dense_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_inner.json deleted file mode 100644 index 90f75693..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_inner", - "textures": { - "bottom": "unicopia:block/dense_cloud", - "side": "unicopia:block/dense_cloud", - "top": "unicopia:block/dense_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_outer.json deleted file mode 100644 index 8505daec..00000000 --- a/src/main/resources/assets/unicopia/models/block/dense_cloud_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_outer", - "textures": { - "bottom": "unicopia:block/dense_cloud", - "side": "unicopia:block/dense_cloud", - "top": "unicopia:block/dense_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs.json deleted file mode 100644 index 13559128..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs", - "textures": { - "bottom": "unicopia:block/etched_cloud", - "side": "unicopia:block/etched_cloud", - "top": "unicopia:block/etched_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_inner.json deleted file mode 100644 index e54dae19..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_inner", - "textures": { - "bottom": "unicopia:block/etched_cloud", - "side": "unicopia:block/etched_cloud", - "top": "unicopia:block/etched_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_outer.json deleted file mode 100644 index 8ee25113..00000000 --- a/src/main/resources/assets/unicopia/models/block/etched_cloud_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_outer", - "textures": { - "bottom": "unicopia:block/etched_cloud", - "side": "unicopia:block/etched_cloud", - "top": "unicopia:block/etched_cloud" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_full.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_full.json index 37d5bc25..558d91f9 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_full.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_full.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json index 23277ae2..42dbd2e9 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json index 6e072670..3e38a952 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json index 56bd77f6..a49dcfa1 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json index de17ffca..e1f8d024 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json index 12905fcc..d4339052 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json index c9b9377a..3df63176 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json index b263136e..233d45c8 100644 --- a/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json +++ b/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json @@ -1,6 +1,5 @@ { "textures": { - "all": "unicopia:block/cloud", "particle": "#all" }, "elements": [ @@ -15,4 +14,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_0.json b/src/main/resources/assets/unicopia/models/block/frosted_obsidian_0.json deleted file mode 100644 index f20d67f3..00000000 --- a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/frosted_obsidian_0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_1.json b/src/main/resources/assets/unicopia/models/block/frosted_obsidian_1.json deleted file mode 100644 index c25d9961..00000000 --- a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/frosted_obsidian_1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_2.json b/src/main/resources/assets/unicopia/models/block/frosted_obsidian_2.json deleted file mode 100644 index 42de1afc..00000000 --- a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/frosted_obsidian_2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_3.json b/src/main/resources/assets/unicopia/models/block/frosted_obsidian_3.json deleted file mode 100644 index ad70b710..00000000 --- a/src/main/resources/assets/unicopia/models/block/frosted_obsidian_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "unicopia:block/frosted_obsidian_3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/inner_seethrough_stairs.json similarity index 66% rename from src/main/resources/assets/unicopia/models/block/cloud_stairs_inner.json rename to src/main/resources/assets/unicopia/models/block/inner_seethrough_stairs.json index 4f4122b3..c313a669 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_stairs_inner.json +++ b/src/main/resources/assets/unicopia/models/block/inner_seethrough_stairs.json @@ -1,10 +1,5 @@ { "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/cloud", - "top": "unicopia:block/cloud" - }, "elements": [ { "from": [0, 0, 8], @@ -29,8 +24,8 @@ "from": [0, 0, 0], "to": [8, 8, 8], "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"}, - "west": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "west"}, + "north": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "north"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "west"}, "up": {"uv": [0, 0, 8, 8], "texture": "#top"}, "down": {"uv": [0, 8, 8, 16], "texture": "#bottom", "cullface": "down"} } @@ -39,9 +34,9 @@ "from": [8, 8, 0], "to": [16, 16, 8], "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"}, - "east": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#side"}, + "north": {"uv": [0, 0, 8, 8], "texture": "#step", "cullface": "north"}, + "east": {"uv": [8, 0, 16, 8], "texture": "#step", "cullface": "east"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#step"}, "up": {"uv": [8, 0, 16, 8], "texture": "#top", "cullface": "up"} } }, @@ -49,8 +44,8 @@ "from": [8, 8, 8], "to": [16, 16, 16], "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#step", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#step", "cullface": "south"}, "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} } }, @@ -58,9 +53,9 @@ "from": [0, 8, 8], "to": [8, 16, 16], "faces": { - "north": {"uv": [8, 0, 16, 8], "texture": "#side"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "west"}, + "north": {"uv": [8, 0, 16, 8], "texture": "#step"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#step", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#step", "cullface": "west"}, "up": {"uv": [0, 8, 8, 16], "texture": "#top", "cullface": "up"} } } diff --git a/src/main/resources/assets/unicopia/models/block/mysterious_egg_1.json b/src/main/resources/assets/unicopia/models/block/mysterious_egg_stage1.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/mysterious_egg_1.json rename to src/main/resources/assets/unicopia/models/block/mysterious_egg_stage1.json diff --git a/src/main/resources/assets/unicopia/models/block/mysterious_egg_2.json b/src/main/resources/assets/unicopia/models/block/mysterious_egg_stage2.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/mysterious_egg_2.json rename to src/main/resources/assets/unicopia/models/block/mysterious_egg_stage2.json diff --git a/src/main/resources/assets/unicopia/models/block/mysterious_egg_3.json b/src/main/resources/assets/unicopia/models/block/mysterious_egg_stage3.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/mysterious_egg_3.json rename to src/main/resources/assets/unicopia/models/block/mysterious_egg_stage3.json diff --git a/src/main/resources/assets/unicopia/models/block/cloud_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/outer_seethrough_stairs.json similarity index 52% rename from src/main/resources/assets/unicopia/models/block/cloud_stairs_outer.json rename to src/main/resources/assets/unicopia/models/block/outer_seethrough_stairs.json index 0a56fa79..dac0f891 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_stairs_outer.json +++ b/src/main/resources/assets/unicopia/models/block/outer_seethrough_stairs.json @@ -1,18 +1,13 @@ { "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/cloud", - "top": "unicopia:block/cloud" - }, "elements": [ { "from": [0, 0, 0], "to": [16, 8, 8], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "east"}, - "west": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "west"}, + "north": {"uv": [0, 8, 16, 16], "texture": "#step", "cullface": "north"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "east"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "west"}, "up": {"uv": [0, 0, 16, 8], "texture": "#top"}, "down": {"uv": [0, 8, 16, 16], "texture": "#bottom", "cullface": "down"} } @@ -21,8 +16,8 @@ "from": [0, 0, 8], "to": [8, 8, 16], "faces": { - "south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "south"}, + "west": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "west"}, "up": {"uv": [0, 8, 8, 16], "texture": "#top"}, "down": {"uv": [0, 0, 8, 8], "texture": "#bottom", "cullface": "down"} } @@ -31,11 +26,8 @@ "from": [8, 0, 8], "to": [16, 8, 16], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "north"}, "east": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "east"}, "south": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, "down": {"uv": [8, 0, 16, 8], "texture": "#bottom", "cullface": "down"} } }, @@ -43,10 +35,10 @@ "from": [8, 8, 8], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#side"}, - "east": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, - "west": {"uv": [8, 0, 16, 8], "texture": "#side"}, + "north": {"uv": [0, 0, 8, 8], "texture": "#step"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#step", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#step", "cullface": "south"}, + "west": {"uv": [8, 0, 16, 8], "texture": "#step"}, "up": {"uv": [8, 8, 16, 16], "texture": "#top", "cullface": "up"} } } diff --git a/src/main/resources/assets/unicopia/models/block/pie_corner.json b/src/main/resources/assets/unicopia/models/block/pie_corner.json index 4051e694..3cb60354 100644 --- a/src/main/resources/assets/unicopia/models/block/pie_corner.json +++ b/src/main/resources/assets/unicopia/models/block/pie_corner.json @@ -8,10 +8,10 @@ "faces": { "up": { "uv": [ 1, 1, 8, 8 ], "texture": "#top" }, "down": { "uv": [ 1, 8, 8, 15 ], "texture": "#bottom" }, - "north": { "uv": [ 8, 11, 15, 16 ], "texture": "#sides" }, - "south": { "uv": [ 1, 11, 8, 16 ], "texture": "#inner" }, - "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#sides" }, - "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#inner" } + "north": { "uv": [ 8, 11, 15, 16 ], "texture": "#side" }, + "south": { "uv": [ 1, 11, 8, 16 ], "texture": "#inside" }, + "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#inside" } } } ] diff --git a/src/main/resources/assets/unicopia/models/block/pie_elbow.json b/src/main/resources/assets/unicopia/models/block/pie_elbow.json index bfd91d78..6a8618df 100644 --- a/src/main/resources/assets/unicopia/models/block/pie_elbow.json +++ b/src/main/resources/assets/unicopia/models/block/pie_elbow.json @@ -8,10 +8,10 @@ "faces": { "up": { "uv": [ 1, 1, 15, 8 ], "texture": "#top" }, "down": { "uv": [ 1, 8, 15, 15 ], "texture": "#bottom" }, - "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" }, - "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#inner" }, - "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#sides" }, - "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#sides" } + "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" }, + "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#inside" }, + "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#side" } } }, { "from": [ 8, 0, 8 ], @@ -19,10 +19,10 @@ "faces": { "up": { "uv": [ 8, 8, 15, 15 ], "texture": "#top" }, "down": { "uv": [ 8, 1, 15, 8 ], "texture": "#bottom" }, - "north": { "uv": [ 1, 11, 8, 16 ], "texture": "#sides" }, - "south": { "uv": [ 8, 11, 15, 16 ], "texture": "#sides" }, - "west": { "uv": [ 8, 11, 15, 16 ], "texture": "#inner" }, - "east": { "uv": [ 1, 11, 8, 16 ], "texture": "#sides" } + "north": { "uv": [ 1, 11, 8, 16 ], "texture": "#side" }, + "south": { "uv": [ 8, 11, 15, 16 ], "texture": "#side" }, + "west": { "uv": [ 8, 11, 15, 16 ], "texture": "#inside" }, + "east": { "uv": [ 1, 11, 8, 16 ], "texture": "#side" } } } ] diff --git a/src/main/resources/assets/unicopia/models/block/pie_full.json b/src/main/resources/assets/unicopia/models/block/pie_full.json index f0687e00..d2b90d34 100644 --- a/src/main/resources/assets/unicopia/models/block/pie_full.json +++ b/src/main/resources/assets/unicopia/models/block/pie_full.json @@ -8,10 +8,10 @@ "faces": { "up": { "uv": [ 1, 1, 15, 15 ], "texture": "#top" }, "down": { "uv": [ 1, 1, 15, 15 ], "texture": "#bottom" }, - "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" }, - "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" }, - "west": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" }, - "east": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" } + "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" }, + "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" }, + "west": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" }, + "east": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" } } } ] diff --git a/src/main/resources/assets/unicopia/models/block/pie_straight.json b/src/main/resources/assets/unicopia/models/block/pie_straight.json index 9d1b6ba7..7bc4e367 100644 --- a/src/main/resources/assets/unicopia/models/block/pie_straight.json +++ b/src/main/resources/assets/unicopia/models/block/pie_straight.json @@ -8,10 +8,10 @@ "faces": { "up": { "uv": [ 1, 1, 15, 8 ], "texture": "#top" }, "down": { "uv": [ 1, 8, 15, 15 ], "texture": "#bottom" }, - "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#sides" }, - "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#inner" }, - "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#sides" }, - "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#sides" } + "north": { "uv": [ 1, 11, 15, 16 ], "texture": "#side" }, + "south": { "uv": [ 1, 11, 15, 16 ], "texture": "#inside" }, + "west": { "uv": [ 1, 11, 8, 16 ], "texture": "#side" }, + "east": { "uv": [ 8, 11, 15, 16 ], "texture": "#side" } } } ] diff --git a/src/main/resources/assets/unicopia/models/block/scallop_shell_1.json b/src/main/resources/assets/unicopia/models/block/scallop_shell_1.json deleted file mode 100644 index dc24de27..00000000 --- a/src/main/resources/assets/unicopia/models/block/scallop_shell_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_1", - "textures": { - "shell": "unicopia:item/scallop_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/scallop_shell_2.json b/src/main/resources/assets/unicopia/models/block/scallop_shell_2.json deleted file mode 100644 index 31cb6d3a..00000000 --- a/src/main/resources/assets/unicopia/models/block/scallop_shell_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_2", - "textures": { - "shell": "unicopia:item/scallop_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/scallop_shell_3.json b/src/main/resources/assets/unicopia/models/block/scallop_shell_3.json deleted file mode 100644 index e1568583..00000000 --- a/src/main/resources/assets/unicopia/models/block/scallop_shell_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_3", - "textures": { - "shell": "unicopia:item/scallop_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/scallop_shell_4.json b/src/main/resources/assets/unicopia/models/block/scallop_shell_4.json deleted file mode 100644 index d3b086a3..00000000 --- a/src/main/resources/assets/unicopia/models/block/scallop_shell_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_4", - "textures": { - "shell": "unicopia:item/scallop_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/seethrough_stairs.json similarity index 59% rename from src/main/resources/assets/unicopia/models/block/cloud_stairs.json rename to src/main/resources/assets/unicopia/models/block/seethrough_stairs.json index 0f670b42..ebcf9327 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_stairs.json +++ b/src/main/resources/assets/unicopia/models/block/seethrough_stairs.json @@ -1,10 +1,5 @@ { "parent": "minecraft:block/stairs", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/cloud", - "top": "unicopia:block/cloud" - }, "elements": [ { "from": [8, 0, 0], @@ -20,9 +15,9 @@ "from": [0, 0, 0], "to": [8, 8, 16], "faces": { - "north": {"uv": [8, 8, 16, 16], "texture": "#side", "cullface": "north"}, - "south": {"uv": [0, 8, 8, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#side", "cullface": "west"}, + "north": {"uv": [8, 8, 16, 16], "texture": "#step", "cullface": "north"}, + "south": {"uv": [0, 8, 8, 16], "texture": "#step", "cullface": "south"}, + "west": {"uv": [0, 8, 16, 16], "texture": "#step", "cullface": "west"}, "up": {"uv": [0, 0, 8, 16], "texture": "#top"}, "down": {"uv": [0, 0, 8, 16], "texture": "#bottom", "cullface": "down"} } @@ -31,10 +26,10 @@ "from": [8, 8, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#side", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 8], "texture": "#side", "cullface": "east"}, - "south": {"uv": [8, 0, 16, 8], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 8], "texture": "#side"}, + "north": {"uv": [0, 0, 8, 8], "texture": "#step", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 8], "texture": "#step", "cullface": "east"}, + "south": {"uv": [8, 0, 16, 8], "texture": "#step", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 8], "texture": "#step"}, "up": {"uv": [8, 0, 16, 16], "texture": "#top", "cullface": "up"} } } diff --git a/src/main/resources/assets/unicopia/models/block/slime_pustule_rope.json b/src/main/resources/assets/unicopia/models/block/slime_pustule_string.json similarity index 100% rename from src/main/resources/assets/unicopia/models/block/slime_pustule_rope.json rename to src/main/resources/assets/unicopia/models/block/slime_pustule_string.json diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud.json deleted file mode 100644 index 669150b0..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/cloud", - "top": "unicopia:block/soggy_cloud_top", - "side": "unicopia:block/soggy_cloud_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab.json deleted file mode 100644 index e3b7191d..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/soggy_cloud_slab_side", - "top": "unicopia:block/soggy_cloud_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab_top.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab_top.json deleted file mode 100644 index d7fa2ddc..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/soggy_cloud_slab_side", - "top": "unicopia:block/soggy_cloud_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs.json deleted file mode 100644 index 0e463894..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/soggy_cloud_side", - "top": "unicopia:block/soggy_cloud_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_inner.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_inner.json deleted file mode 100644 index 88488260..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_inner", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/soggy_cloud_side", - "top": "unicopia:block/soggy_cloud_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_outer.json b/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_outer.json deleted file mode 100644 index 1dc71cdb..00000000 --- a/src/main/resources/assets/unicopia/models/block/soggy_cloud_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs_outer", - "textures": { - "bottom": "unicopia:block/cloud", - "side": "unicopia:block/soggy_cloud_side", - "top": "unicopia:block/soggy_cloud_top" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie.json b/src/main/resources/assets/unicopia/models/block/stomped_apple_pie.json deleted file mode 100644 index c01a27a8..00000000 --- a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_full", - "textures": { - "top": "unicopia:block/apple_pie_top_stomped", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_corner.json b/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_corner.json deleted file mode 100644 index 14eb7794..00000000 --- a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_corner.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_corner", - "textures": { - "top": "unicopia:block/apple_pie_top_stomped", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_elbow.json b/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_elbow.json deleted file mode 100644 index 1f3f792a..00000000 --- a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_elbow.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_elbow", - "textures": { - "top": "unicopia:block/apple_pie_top_stomped", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_straight.json b/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_straight.json deleted file mode 100644 index 463904f3..00000000 --- a/src/main/resources/assets/unicopia/models/block/stomped_apple_pie_straight.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "unicopia:block/pie_straight", - "textures": { - "top": "unicopia:block/apple_pie_top_stomped", - "bottom": "unicopia:block/apple_pie_bottom", - "sides": "unicopia:block/apple_pie_side", - "inner": "unicopia:block/apple_pie_inner" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/surface_chitin.json b/src/main/resources/assets/unicopia/models/block/surface_chitin.json deleted file mode 100644 index ea258e39..00000000 --- a/src/main/resources/assets/unicopia/models/block/surface_chitin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/chitin_bottom", - "top": "unicopia:block/chitin_top", - "side": "unicopia:block/chitin_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/surface_chitin_snowy.json b/src/main/resources/assets/unicopia/models/block/surface_chitin_snowy.json deleted file mode 100644 index e7e877d6..00000000 --- a/src/main/resources/assets/unicopia/models/block/surface_chitin_snowy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "bottom": "unicopia:block/chitin", - "top": "unicopia:block/chitin_top", - "side": "unicopia:block/chitin_side_snow_covered" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_bne.json b/src/main/resources/assets/unicopia/models/block/template_bale_bne.json index 7453b2e9..8d57a7cc 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_bne.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_bne.json @@ -1,22 +1,20 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ - { - "name": "bottom_north_east", - "from": [8, 0, 0], - "to": [16, 8, 8], - "faces": { - "north": {"uv": [0, 8, 8, 16], "texture": "#side"}, - "east": {"uv": [8, 8, 16, 16], "texture": "#side"}, - "south": {"uv": [8, 8, 16, 16], "texture": "#top"}, - "west": {"uv": [0, 8, 8, 16], "texture": "#top"}, - "up": {"uv": [8, 0, 16, 8], "texture": "#top"}, - "down": {"uv": [8, 8, 16, 16], "texture": "#top"} + { + "name": "bottom_north_east", + "from": [8, 0, 0], + "to": [16, 8, 8], + "faces": { + "north": {"uv": [0, 8, 8, 16], "texture": "#side"}, + "east": {"uv": [8, 8, 16, 16], "texture": "#side"}, + "south": {"uv": [8, 8, 16, 16], "texture": "#top"}, + "west": {"uv": [0, 8, 8, 16], "texture": "#top"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#top"}, + "down": {"uv": [8, 8, 16, 16], "texture": "#top"} + } } - } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_bnw.json b/src/main/resources/assets/unicopia/models/block/template_bale_bnw.json index 6cde59a7..b6928949 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_bnw.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_bnw.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_bse.json b/src/main/resources/assets/unicopia/models/block/template_bale_bse.json index 76ec139b..2d197ff6 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_bse.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_bse.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json index ed4ade6d..4a2b5049 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_tne.json b/src/main/resources/assets/unicopia/models/block/template_bale_tne.json index d23896b4..1aead478 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_tne.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_tne.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json index b465617c..1726640d 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_tse.json b/src/main/resources/assets/unicopia/models/block/template_bale_tse.json index 64d34fa6..b54a8072 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_tse.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_tse.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json index 01f205b0..0f506d53 100644 --- a/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json +++ b/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json @@ -1,8 +1,6 @@ { "textures": { - "top": "block/hay_block_top", - "particle": "block/hay_block_side", - "side": "block/hay_block_side" + "particle": "#side" }, "elements": [ { @@ -19,4 +17,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/clam_shell_1.json b/src/main/resources/assets/unicopia/models/block/template_shell_1.json similarity index 84% rename from src/main/resources/assets/unicopia/models/block/clam_shell_1.json rename to src/main/resources/assets/unicopia/models/block/template_shell_1.json index 281bf5ee..39352ad0 100644 --- a/src/main/resources/assets/unicopia/models/block/clam_shell_1.json +++ b/src/main/resources/assets/unicopia/models/block/template_shell_1.json @@ -1,7 +1,6 @@ { "textures": { - "particle": "#shell", - "shell": "unicopia:item/clam_shell" + "particle": "#shell" }, "elements": [ { @@ -14,4 +13,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/clam_shell_2.json b/src/main/resources/assets/unicopia/models/block/template_shell_2.json similarity index 90% rename from src/main/resources/assets/unicopia/models/block/clam_shell_2.json rename to src/main/resources/assets/unicopia/models/block/template_shell_2.json index fb31088b..c1541e26 100644 --- a/src/main/resources/assets/unicopia/models/block/clam_shell_2.json +++ b/src/main/resources/assets/unicopia/models/block/template_shell_2.json @@ -1,7 +1,6 @@ { "textures": { - "particle": "#shell", - "shell": "unicopia:item/clam_shell" + "particle": "#shell" }, "elements": [ { @@ -23,4 +22,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/clam_shell_3.json b/src/main/resources/assets/unicopia/models/block/template_shell_3.json similarity index 92% rename from src/main/resources/assets/unicopia/models/block/clam_shell_3.json rename to src/main/resources/assets/unicopia/models/block/template_shell_3.json index 14cadc84..bb5447be 100644 --- a/src/main/resources/assets/unicopia/models/block/clam_shell_3.json +++ b/src/main/resources/assets/unicopia/models/block/template_shell_3.json @@ -1,7 +1,6 @@ { "textures": { - "particle": "#shell", - "shell": "unicopia:item/clam_shell" + "particle": "#shell" }, "elements": [ { @@ -30,4 +29,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/clam_shell_4.json b/src/main/resources/assets/unicopia/models/block/template_shell_4.json similarity index 95% rename from src/main/resources/assets/unicopia/models/block/clam_shell_4.json rename to src/main/resources/assets/unicopia/models/block/template_shell_4.json index e269cd5a..72339f6e 100644 --- a/src/main/resources/assets/unicopia/models/block/clam_shell_4.json +++ b/src/main/resources/assets/unicopia/models/block/template_shell_4.json @@ -1,7 +1,6 @@ { "textures": { - "particle": "#shell", - "shell": "unicopia:item/clam_shell" + "particle": "#shell" }, "elements": [ { @@ -41,4 +40,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/main/resources/assets/unicopia/models/block/turret_shell_1.json b/src/main/resources/assets/unicopia/models/block/turret_shell_1.json deleted file mode 100644 index 1357d241..00000000 --- a/src/main/resources/assets/unicopia/models/block/turret_shell_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_1", - "textures": { - "shell": "unicopia:item/turret_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/turret_shell_2.json b/src/main/resources/assets/unicopia/models/block/turret_shell_2.json deleted file mode 100644 index 3d0cdd97..00000000 --- a/src/main/resources/assets/unicopia/models/block/turret_shell_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_2", - "textures": { - "shell": "unicopia:item/turret_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/turret_shell_3.json b/src/main/resources/assets/unicopia/models/block/turret_shell_3.json deleted file mode 100644 index 90abe4d6..00000000 --- a/src/main/resources/assets/unicopia/models/block/turret_shell_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_3", - "textures": { - "shell": "unicopia:item/turret_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/turret_shell_4.json b/src/main/resources/assets/unicopia/models/block/turret_shell_4.json deleted file mode 100644 index f25b45cc..00000000 --- a/src/main/resources/assets/unicopia/models/block/turret_shell_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/clam_shell_4", - "textures": { - "shell": "unicopia:item/turret_shell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/weather_vane.json b/src/main/resources/assets/unicopia/models/block/weather_vane.json deleted file mode 100644 index 824dcce2..00000000 --- a/src/main/resources/assets/unicopia/models/block/weather_vane.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "particle": "unicopia:item/weather_vane" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/carved_cloud.json b/src/main/resources/assets/unicopia/models/item/carved_cloud.json deleted file mode 100644 index 239a7eac..00000000 --- a/src/main/resources/assets/unicopia/models/item/carved_cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/carved_cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_hull.json b/src/main/resources/assets/unicopia/models/item/chiselled_chitin_hull.json deleted file mode 100644 index a99a7ffc..00000000 --- a/src/main/resources/assets/unicopia/models/item/chiselled_chitin_hull.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chiselled_chitin_hull" -} diff --git a/src/main/resources/assets/unicopia/models/item/chitin.json b/src/main/resources/assets/unicopia/models/item/chitin.json deleted file mode 100644 index ad7a596a..00000000 --- a/src/main/resources/assets/unicopia/models/item/chitin.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chitin" -} diff --git a/src/main/resources/assets/unicopia/models/item/chitin_spikes.json b/src/main/resources/assets/unicopia/models/item/chitin_spikes.json deleted file mode 100644 index e2b656dc..00000000 --- a/src/main/resources/assets/unicopia/models/item/chitin_spikes.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/chitin_spikes" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_brick_stairs.json b/src/main/resources/assets/unicopia/models/item/cloud_brick_stairs.json deleted file mode 100644 index 1ad15fea..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_brick_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_brick_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_lump.json b/src/main/resources/assets/unicopia/models/item/cloud_lump.json deleted file mode 100644 index c8ca05f3..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_lump.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/cloud_lump" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_pillar.json b/src/main/resources/assets/unicopia/models/item/cloud_pillar.json index 2bbe230b..d2e686fd 100644 --- a/src/main/resources/assets/unicopia/models/item/cloud_pillar.json +++ b/src/main/resources/assets/unicopia/models/item/cloud_pillar.json @@ -4,7 +4,7 @@ "top": "unicopia:block/cloud_pillar_top", "side": "unicopia:block/cloud_pillar_side", "side_end": "unicopia:block/cloud_pillar_side_end", - "particle": "unicopia:block/cloud_pillar_side" + "particle": "#side" }, "elements": [ { diff --git a/src/main/resources/assets/unicopia/models/item/cloud_plank_stairs.json b/src/main/resources/assets/unicopia/models/item/cloud_plank_stairs.json deleted file mode 100644 index 3de5b6ca..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_plank_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_plank_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_stairs.json b/src/main/resources/assets/unicopia/models/item/cloud_stairs.json deleted file mode 100644 index 4073e673..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json b/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json deleted file mode 100644 index 8ee0cee8..00000000 --- a/src/main/resources/assets/unicopia/models/item/dense_cloud_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/dense_cloud_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/etched_cloud_stairs.json b/src/main/resources/assets/unicopia/models/item/etched_cloud_stairs.json deleted file mode 100644 index a8728434..00000000 --- a/src/main/resources/assets/unicopia/models/item/etched_cloud_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/etched_cloud_stairs" -} diff --git a/src/main/resources/assets/unicopia/models/item/filled_jar.json b/src/main/resources/assets/unicopia/models/item/filled_jar.json deleted file mode 100644 index 43a272a6..00000000 --- a/src/main/resources/assets/unicopia/models/item/filled_jar.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "builtin/entity" -} diff --git a/src/main/resources/assets/unicopia/models/item/gemstone.json b/src/main/resources/assets/unicopia/models/item/gemstone.json deleted file mode 100644 index bc034c48..00000000 --- a/src/main/resources/assets/unicopia/models/item/gemstone.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/gemstone" - }, - "overrides": [ - { - "predicate": { - "affinity": 0 - }, - "model": "unicopia:item/gemstone_pure" - }, - { - "predicate": { - "affinity": 1 - }, - "model": "unicopia:item/gemstone_corrupted" - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/item/gemstone_corrupted.json b/src/main/resources/assets/unicopia/models/item/gemstone_corrupted.json deleted file mode 100644 index b3647430..00000000 --- a/src/main/resources/assets/unicopia/models/item/gemstone_corrupted.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/gemstone_corrupted" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/gemstone_pure.json b/src/main/resources/assets/unicopia/models/item/gemstone_pure.json deleted file mode 100644 index 2aac6a7c..00000000 --- a/src/main/resources/assets/unicopia/models/item/gemstone_pure.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/gemstone_pure" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/hive.json b/src/main/resources/assets/unicopia/models/item/hive.json deleted file mode 100644 index dbb7f204..00000000 --- a/src/main/resources/assets/unicopia/models/item/hive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "unicopia:block/hive_side" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/mango_leaves.json b/src/main/resources/assets/unicopia/models/item/mango_leaves.json deleted file mode 100644 index 4be7c1ad..00000000 --- a/src/main/resources/assets/unicopia/models/item/mango_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "minecraft:block/jungle_leaves" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/mysterious_egg.json b/src/main/resources/assets/unicopia/models/item/mysterious_egg.json index 05f44e97..7c9548c9 100644 --- a/src/main/resources/assets/unicopia/models/item/mysterious_egg.json +++ b/src/main/resources/assets/unicopia/models/item/mysterious_egg.json @@ -1,5 +1,5 @@ { - "parent": "unicopia:block/mysterious_egg_1", + "parent": "unicopia:block/mysterious_egg_stage1", "gui_light": "side", "display": { "gui": { diff --git a/src/main/resources/assets/unicopia/models/item/plunder_vine.json b/src/main/resources/assets/unicopia/models/item/plunder_vine.json deleted file mode 100644 index 32b343c6..00000000 --- a/src/main/resources/assets/unicopia/models/item/plunder_vine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/plunder_vine_bud" -} diff --git a/src/main/resources/assets/unicopia/models/item/shaping_bench.json b/src/main/resources/assets/unicopia/models/item/shaping_bench.json deleted file mode 100644 index 4ad37e87..00000000 --- a/src/main/resources/assets/unicopia/models/item/shaping_bench.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/shaping_bench" -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/slime_pustule.json b/src/main/resources/assets/unicopia/models/item/slime_pustule.json deleted file mode 100644 index 1e556beb..00000000 --- a/src/main/resources/assets/unicopia/models/item/slime_pustule.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/slime_pustule_pod" -} diff --git a/src/main/resources/assets/unicopia/models/item/soggy_cloud.json b/src/main/resources/assets/unicopia/models/item/soggy_cloud.json deleted file mode 100644 index 7babfca8..00000000 --- a/src/main/resources/assets/unicopia/models/item/soggy_cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/soggy_cloud_slab.json b/src/main/resources/assets/unicopia/models/item/soggy_cloud_slab.json deleted file mode 100644 index 7f1b60e7..00000000 --- a/src/main/resources/assets/unicopia/models/item/soggy_cloud_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud_slab" -} diff --git a/src/main/resources/assets/unicopia/models/item/surface_chitin.json b/src/main/resources/assets/unicopia/models/item/surface_chitin.json deleted file mode 100644 index aa4ca0bf..00000000 --- a/src/main/resources/assets/unicopia/models/item/surface_chitin.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/surface_chitin" -} diff --git a/src/main/resources/assets/unicopia/models/item/sunglasses.json b/src/main/resources/assets/unicopia/models/item/template_eyewear.json similarity index 100% rename from src/main/resources/assets/unicopia/models/item/sunglasses.json rename to src/main/resources/assets/unicopia/models/item/template_eyewear.json diff --git a/src/main/resources/assets/unicopia/models/item/template_mug.json b/src/main/resources/assets/unicopia/models/item/template_mug.json index 78012844..048e6f8f 100644 --- a/src/main/resources/assets/unicopia/models/item/template_mug.json +++ b/src/main/resources/assets/unicopia/models/item/template_mug.json @@ -1,8 +1,5 @@ { "parent": "item/handheld", - "textures": { - "layer0": "unicopia:item/mug" - }, "display": { "thirdperson_righthand": { "rotation": [ 0, -90, -55 ], diff --git a/src/main/resources/assets/unicopia/models/item/unstable_cloud.json b/src/main/resources/assets/unicopia/models/item/unstable_cloud.json deleted file mode 100644 index 7babfca8..00000000 --- a/src/main/resources/assets/unicopia/models/item/unstable_cloud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "unicopia:block/cloud" -} diff --git a/src/main/resources/assets/unicopia/models/item/weather_vane.json b/src/main/resources/assets/unicopia/models/item/weather_vane.json deleted file mode 100644 index 0c105c42..00000000 --- a/src/main/resources/assets/unicopia/models/item/weather_vane.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:item/weather_vane" - } -} diff --git a/src/main/resources/assets/unicopia/textures/block/apple_pie_inner.png b/src/main/resources/assets/unicopia/textures/block/apple_pie_inside.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/apple_pie_inner.png rename to src/main/resources/assets/unicopia/textures/block/apple_pie_inside.png diff --git a/src/main/resources/assets/unicopia/textures/block/carved_cloud.png b/src/main/resources/assets/unicopia/textures/block/carved_cloud_side.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/carved_cloud.png rename to src/main/resources/assets/unicopia/textures/block/carved_cloud_side.png diff --git a/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_0.png b/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage0.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/frosted_obsidian_0.png rename to src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage0.png diff --git a/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_1.png b/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage1.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/frosted_obsidian_1.png rename to src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage1.png diff --git a/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_2.png b/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage2.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/frosted_obsidian_2.png rename to src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage2.png diff --git a/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_3.png b/src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage3.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/frosted_obsidian_3.png rename to src/main/resources/assets/unicopia/textures/block/frosted_obsidian_stage3.png From 54db20a623dd99a2519d47a8257bdcec28bc62f3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 16 Mar 2024 16:09:09 +0000 Subject: [PATCH 22/44] Give stable doors their internals back --- .../datagen/providers/BlockModels.java | 2 + .../providers/UBlockStateModelGenerator.java | 77 ++++++++++++++++++- .../unicopia/models/block/door_left.json | 19 +++++ .../unicopia/models/block/door_right.json | 19 +++++ 4 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/unicopia/models/block/door_left.json create mode 100644 src/main/resources/assets/unicopia/models/block/door_right.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java index 90f3f2bb..28c6acd4 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -30,6 +30,8 @@ public interface BlockModels { Model STRAIGHT_STAIRS = block("seethrough_stairs", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); Model INNER_STAIRS = block("inner_seethrough_stairs", "_inner", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); Model OUTER_STAIRS = block("outer_seethrough_stairs", "_outer", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); + Model DOOR_LEFT = block("door_left", TextureKey.BOTTOM, TextureKey.TOP); + Model DOOR_RIGHT = block("door_right", TextureKey.BOTTOM, TextureKey.TOP); Factory CROP = Factory.of(TextureMap::crop, Models.CROP); Factory CUBE_ALL = Factory.of(TextureMap::all, Models.CUBE_ALL); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index fe4b4e18..59bd9502 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -18,7 +18,10 @@ import com.minelittlepony.unicopia.server.world.Tree; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.enums.DoorHinge; +import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateSupplier; import net.minecraft.data.client.BlockStateVariant; import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.Model; @@ -75,7 +78,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerAll((g, block) -> g.registerParentedItemModel(block, ModelIds.getBlockModelId(block)), UBlocks.SHAPING_BENCH, UBlocks.SURFACE_CHITIN); registerAll(UBlockStateModelGenerator::registerSimpleState, UBlocks.SHAPING_BENCH, UBlocks.BANANAS); // doors - registerAll(UBlockStateModelGenerator::registerDoor, UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR); + registerAll(UBlockStateModelGenerator::registerStableDoor, UBlocks.STABLE_DOOR, UBlocks.DARK_OAK_DOOR, UBlocks.CRYSTAL_DOOR, UBlocks.CLOUD_DOOR); // cloud blocks createCustomTexturePool(UBlocks.CLOUD, TexturedModel.CUBE_ALL).same(UBlocks.UNSTABLE_CLOUD).slab(UBlocks.CLOUD_SLAB).stairs(UBlocks.CLOUD_STAIRS); @@ -311,6 +314,78 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { super.registerBed(bed, particleSource); } + public void registerStableDoor(Block door) { + TextureMap topTextures = TextureMap.topBottom(door); + TextureMap bottomTextures = topTextures.copyAndAdd(TextureKey.TOP, topTextures.getTexture(TextureKey.BOTTOM)); + registerItemModel(door.asItem()); + blockStateCollector.accept(createStableDoorBlockState(door, + BlockModels.DOOR_LEFT.upload(door, "_bottom_left", bottomTextures, modelCollector), + BlockModels.DOOR_RIGHT.upload(door, "_bottom_right", bottomTextures, modelCollector), + BlockModels.DOOR_LEFT.upload(door, "_top_left", topTextures, modelCollector), + BlockModels.DOOR_RIGHT.upload(door, "_top_right", topTextures, modelCollector) + )); + } + + public static BlockStateSupplier createStableDoorBlockState(Block doorBlock, Identifier bottomLeftHingeClosedModelId, Identifier bottomRightHingeClosedModelId, Identifier topLeftHingeClosedModelId, Identifier topRightHingeClosedModelId) { + var variants = BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN); + fillStableDoorVariantMap(variants, DoubleBlockHalf.LOWER, bottomLeftHingeClosedModelId, bottomRightHingeClosedModelId); + fillStableDoorVariantMap(variants, DoubleBlockHalf.UPPER, topLeftHingeClosedModelId, topRightHingeClosedModelId); + return VariantsBlockStateSupplier.create(doorBlock).coordinate(variants); + } + + public static BlockStateVariantMap.QuadrupleProperty fillStableDoorVariantMap( + BlockStateVariantMap.QuadrupleProperty variantMap, + DoubleBlockHalf targetHalf, Identifier leftModelId, Identifier rightModelId) { + return variantMap + .register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId)) + .register(Direction.SOUTH, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R90)) + .register(Direction.WEST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R180)) + .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + + .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId)) + .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R90)) + .register(Direction.WEST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R180)) + .register(Direction.NORTH, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + + .register(Direction.EAST, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R90)) + .register(Direction.SOUTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R180)) + .register(Direction.WEST, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, rightModelId)) + + .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId)) + .register(Direction.WEST, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R90)) + .register(Direction.NORTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() + .put(VariantSettings.MODEL, leftModelId) + .put(VariantSettings.Y, VariantSettings.Rotation.R180)); + } + public void registerHiveBlock(Block hive) { Identifier core = ModelIds.getBlockSubModelId(hive, "_core"); Identifier side = ModelIds.getBlockSubModelId(hive, "_side"); diff --git a/src/main/resources/assets/unicopia/models/block/door_left.json b/src/main/resources/assets/unicopia/models/block/door_left.json new file mode 100644 index 00000000..6c5b0b27 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/door_left.json @@ -0,0 +1,19 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#top" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, + "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#top", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#top", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "west" }, + "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#top", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/unicopia/models/block/door_right.json b/src/main/resources/assets/unicopia/models/block/door_right.json new file mode 100644 index 00000000..bf096276 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/door_right.json @@ -0,0 +1,19 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#top" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 3, 16, 16 ], + "faces": { + "up": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "up" }, + "down": { "uv": [ 13, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "north": { "uv": [ 3, 0, 0, 16 ], "texture": "#top", "cullface": "north" }, + "south": { "uv": [ 0, 0, 3, 16 ], "texture": "#top", "cullface": "south" }, + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#top", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "east" } + } + } + ] +} From 620e5622f1ddda2359e62cc2ea9a902f8b360d6e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 16 Mar 2024 16:17:35 +0000 Subject: [PATCH 23/44] Updated cloud and crystal door item textures --- .../unicopia/textures/item/cloud_door.png | Bin 245 -> 6337 bytes .../unicopia/textures/item/crystal_door.png | Bin 219 -> 6425 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/unicopia/textures/item/cloud_door.png b/src/main/resources/assets/unicopia/textures/item/cloud_door.png index c7839077bce056c30d2b145566040a5788412e84..423f8397ac0f4c18e19fd8f9caacc27c7902f437 100644 GIT binary patch literal 6337 zcmeHLdsGuw8lOB!LV)EJ5GgJpVvUcyCJ#si1R+RjqdYdNVu~|VJHk%zB%;ARe!a_qrLPtkMhx5k7C;om+d_n?0Sv;OE zm^?NiL6|aOvQ(x}C=$o3(^K&@v0Q;85L$3>aA-(qTv%8fo|KS;-}N!@0T#(YF)?TY zj2=m2MA8NhV2KcC5RE##R1i@HGl<3J1am{cVOs=Jia}>Gf`XV#7@Y^>7&9^`DoK{b ziY_47f*KzF#EP|?vC}s1jVbK9oGdpw7X))-N5zefA9w$F;e?3_r79&=t;x>O=1$Mk zJy2vQeyF6hY_`cvTFNV|b6xJ*y84F3riF{1T)gC|rJm=WZ(jMri>q2%+g@pZ^|ja6 zt$$<7*0;B9e`m+L@9o=vpriA{k3K&5>9Ow5K0p4&iIb;$&-9)B`rP>o-(30O>W}}t zcKyc9e#8s$^dDYkckqe?UUVjt!DJ&|G;Trn?Nekbx zuFdm&){g~RSrD%vGq8oWc_xGk+dP=R-Kg^j-;i^KZS(JJ8E3&awg67g@(Q$=wM)yx z3bZ_0irm{tsS3VTB=3j}Ui(R=4)@_q+mw1^82$ z47|=ej6j-Uq}T@%m{=-#u^=E;i;({`MawH5{p3jbaDk?@X^?~v1z3pmqNOwGJd=j1USIr(!q{F>FS3 zkpQ#62$~B}le?fAz7e*yAN`r9q!$%G7i21E85WFREU!?o!1I|98RKV)dx+miiA4p$ zLIOvE0{1W3|2C|+3M8PO$$=BLg_l;s55gjAc6PolJDXqabXcraB!)Gtp0^@BZ+~Xo z;#04ArW$zP@p~iMH7B&%gvuCCeo{Agqh{43{cL^wbG%X0_ipRyIb!^5Z%0`PyCf^( zCt6Kib)kDj)cZ5IBIB+zJCUB>*>f?n=hmamU;fNFWnXJHMkc@Y)VREewQD?42j7Z(_0jPi(>$M?$+%4%m#mnPR1&-_A!J?V z!teU`4)oMJHvZJz{vyxAcuBJSs*L6Sp8j;}nLi~?nR$lE$zYT;9h$SAvGwKluBHHUud<5M5|i}U5Bp&5_Bw_bzQQ0gw#Kd3P|Y+}OfFp}a1TQ&6? zm^QVcnlM$8ZoZK$x7yPMmv+7{;9JeXr!jl#9DET~G?&YuOGb$ybOKVyQ^mV6DRi8C-sv z(`?Zc=H&Vy;4WQI;dWPRB$E32dU3s6>~NM#WNNiqBE=;*E&>mctI_Tz8bo&2SOnq4 z$RS-Or?uK`b=dg`lQ24J-RS}WjPw2R*{b#WL3q2%rvm69X&|a4GO<)*vq=JHxZK)0 z0PzJh;tZFev6_?=k}gNB(?n|PNV|J%AcWa8IKR5qSw+z?nJ)) zoPi`Lx7wPq)=FB-XIl&@Zo)8p>3vaH-K~F^d$bDMpckP?93GicpH=Dy3R&QsE|&AOoOuc9)y5n@9u&;9@J_ zm~o{{tuk3e3b|S>Qluy?B0?ooig2|&RUwtC&1&2f05QvHg{mZ~0;57uW`MGo@f0Zm zP)1xuh!iSCs>o;}ZMwFA1YI`{~fCSfMu-eEXH-XfYrO2czsWL^TN>#~IWhp~W50Oq6R3gHp z_9)Z{N{a@_fUpFrQvjg)fr}>FNfK^{)8KGar3(gkH-p1^c%00Ho5&&DB!CX?cMSgh z&LpW+BlU)l;Pei&)zbJ&-ss`sr-47DJkRQa^&6=!?-Nx-)_Cu{w^df^QR4HdheAV` zycAqS9ciZG1T626se-VVlkoQNm8-wsIzlN(EpnAg4Ozo+i%Fy)m8l{^DpQHfGAJyW zRB4f0@Zsn#hs9k_ILWMX&=ItP@}zcxd?A&n3B$eXD@c?D5KJVMi)5-h1(Wy)OVB&R z&p1u;ADX054goJ2nCI<-mlwPXC4(OSB0Q9{@?n>W#a@~{bt`xW{ z=X=$4Pp-RC;I5qSRoAa37k6koMcUyjs2(;;^TS6~!d8oAoH0EIdmR2tx8Nx0RyLEak`#d8eB0S=C*XA#w>zXbn%aD4gqe!-VKR+UYgYy^l zeY;72A+ay1@!-5~zshd87N0PKpPg(hEX`WFw0DOlnYnZF{!cDqKV9cP(|PJbbFis6 zf98dcZ+~^^P3~_PSHy%4^>{jSrd8T><@*}*wO9ZZx=`4Z?61Q zZH`-P!_-GwPp=;J@<)xkpAMh9;YN80XKyZ)-8A#2K0SjUsK~e&jmD169Aw!X6Jru zOnr?2u%xuhTVt+!z{+2l$jUr2j~{b}WMK6U7~qJoq;xvjDS-r#y!hylG|@}#2}8V0 Ui7aypegFUf07*qoM6N<$g0;V3Q2+n{ diff --git a/src/main/resources/assets/unicopia/textures/item/crystal_door.png b/src/main/resources/assets/unicopia/textures/item/crystal_door.png index 96e93768f0ee2980d7c30ed62d0cb0ac53fdd8a7..514d0827a5963bb60a1b45ee6d4317d9bdfe9c3e 100644 GIT binary patch literal 6425 zcmeHLYgiLk8lEJOga8T>Dk@!Kz%^cyOm09@?hql?AOR|9t93G&Kq@352@tGq1u1Ik z)}^(rTD#a(U2WB^TDRV6p@LhrEw$RJbhpJzrQO!5#cD-Y_B*+7TX(zcvwfcZ;qaWy zmvi3pp6`9nHjBn3=7rdWaYy-3^g_rK4ZFj2@GRzqlz^~jb<{&hCV>j z0x+5nM;j2+X$*`3{SDAYL5wh{jim*8&MP4v=ZjZEEbw9I5KCxuEELY`p-Ca;!ufS* zre)r>4nh1eG`8n22O`AmKWA&Sc|55|f{SGFFdvu7Rk%zgiRVe;RT70tA_p{WLw`mv z6$`@dVqR{<3N0PG1vPBG{KjKIKv02o~i<5)m=;HdGE zbY_H(VDT%s(%QyX*|8ZrTO#vMT#b|IZFNDM2S!JY89U+E69tnd%N6kniAq&wmU>!t zj%Ip6;Ulw(if7Lu4V1B@)bxbiQCU^(tXa6U{^^Eg%U8Ibdw%r`FTS*9?K<~s8#itK z!?E4ud*S!!a)~3Ab=6TLb_=5Y9u^7AaJ~dIVxSpA}S*I(pok*qw&?9 zEkUue{Hu|A+X>DCaq@E$t|4h2W&fG5y8lX9pRj&i9asp12AjtS$5OFdcU^)F^#7AK za+|>Iy3zjOGpluKeV$Iu#r{R3wdvH6`x?93xVm{`dgk8)MZ5kfS2uTASGHQsEz(Sw zEO4(GUFvqFRTS#fW<#;tB?$lQggUZz=X94~b6|(S{k!NFxVlHzG$jJ_xu(reb9HHf zLt0ERj9qSec{F6%>IV3X;J0*YUgGNl_uJB`kOcc%SfcsNCN;N!ewnMw83E+mKbW~5 z@K@VUX57Q&L5g)pk*XE*07s~~c{E=ObP3$G50-Ov#p8yV<7+OrYl=Pg3-9_PS@7*I zsWOhhy(Ia(OYp~#zvEXI3f%7;?w0L=Ax6P-2p-V|fP=E@AA?8OkjD5H#@^Z8t^W$L zS#3jJ>WcsqHDm{99mw0QUOnC5CG1k^5DeN|+K*`L?5&+Pmtfm;l}g~=JJR_B%8Bfv zgAKu4oto~+Hv{sG>&aXX86LcvJ3L=eCDBemM$J#Q4Dgkugwm+#gbdP#>FWlN%y6+60HP`=8^P!p0AD_{<%YEjS7mhvWyeV!UGf<0fM2DrCAK``cT`EJ*w z+A5b|BP&wPopmX@9R{2w-_#D!;I9$ZXE63;$)&bq0{2cqUjZTyIfXhkE;^y+F6rwY zF&Wk6s^5F-0)d9Mk(;-;UEiguRFK$y%_K0e`GA_6Pe(t=ZCtjpyooM!jW z6^>uv&~pJ;qR*WJS7iFXyR`j9(++8U@ZLSLM;UUi>(mSm7@y+wY{Co_qn6rxc6aTC zGw>r+Z_3Qf(`07ytTv0$R7PQ#bN%ARicBK|_zvG<`+o(FLR!1+0bmfgd z#o4Y}^H>i{JN7y5=3s;v2r#!>G+%n|AjUf8?r=AoNk zeg9C}mY3EVD_b$`+aDJ4MaErk=uc0ni`sB@sc!A;BkSWPoO|fd_u-wl=dLcfb^7nh zo>S}FmMqDMCL2r9|b)?Yaw#Vjjx95Wr4h6fHdd_*Ta5rj4iP%(=+^`b(y0$D`|Zu^#&#%beLzc5DZC z+B4R66f96-+ti0=eKWIw7Z{5o&Suj zX+=oNWAJ?GG!+&*inTLTq@`R$7%X~9EbY=3hDRE}v&I zB=d_DT3l<*q)JUW3vE=v!rVe~;Q~@=;HRc=lAJ0aD5o3*&skn(wyT`Ud=IY*V$?0> z^E?p8f@FR%JR@dWY!pu}l8bPm+G(ni@>4jxB%8sg%FmkSqkwP8{8ER*suGKqz#7XEam5yXSAI5q9 z{K~CbZ6Cea?sEbB5IYI0SR%s3<>lgmGwcp^6_EH6y5|ggVU3j%=Tmk|rH!Q2Rg~Eg zJCMRa_RY6e+R8j~45XMUqsjqlhgBtmmPAj}eKU{+C8lz#XBL<}27uO%t!013>MO4Pw3(nPiL!xNAu0n<#U}!j9+wNHa!MwYD;2mK$5OO81H+ZQG zq-vVQR!+cnn#ze1N^CWkc-BCMtJ3o{$$Y5@@9)VgBOFGUkj$T9GFLkL2MSH)RDpv) zZb}j)cs#C1kjN$RQbl4yKWG+ZvqL2!PS1OhX9R7F3dDf11gcXY@brTgRi=$192Q%l z#Zs2c?|Y-_8`i?*WFQwHQpsnx8|Xi-(s4c-ZnB zlO5Kt@pO5wr~<0O`_22c%;dS0cs$QVp(04H1Upeh89aFcmv@LPCCnuh+&z5d>hCw* zqZ9~2p~NY@Q79uwsZcJHDTGQgo)X3<>Ww4;u1XcM!R&U6(NRs5xj!(^t^rY z1fGqWG#Fi7N}*i8Gm*L}N&<-oAO_p9r^UBhxUjD((#aFMV#)xC*g)VEKSMt-vOCd$A^;2)%y*!2q zM}xTO-ImCv{XLj^}g~t~+(VswFh;7*;hRmwETEw>uXZ;&n_%#};?gk&jxA;w|b` zKjFop!|e7Gh!t%?1An8u0%6xBtX?i-lN)c|uB9138sw17HaZJv|U@08t4E uIVGZ{M&i-|QcA?D32$a1N)sa^Tps`gZ!cCXQm4EC0000 Date: Sun, 17 Mar 2024 12:58:56 +0000 Subject: [PATCH 24/44] Clean up door model generation --- .../datagen/providers/BlockRotation.java | 28 +++++++ .../providers/UBlockStateModelGenerator.java | 81 ++++++------------- 2 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockRotation.java diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockRotation.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockRotation.java new file mode 100644 index 00000000..636a0c79 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockRotation.java @@ -0,0 +1,28 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import net.minecraft.data.client.VariantSettings; +import net.minecraft.data.client.VariantSettings.Rotation; +import net.minecraft.util.math.Direction; + +import static net.minecraft.util.math.Direction.*; + +public class BlockRotation { + private static final Rotation[] ROTATIONS = Rotation.values(); + public static final Direction[] DIRECTIONS = { EAST, SOUTH, WEST, NORTH }; + + public static VariantSettings.Rotation cycle(Rotation rotation, int steps) { + int index = rotation.ordinal() + steps; + while (index < 0) { + index += ROTATIONS.length; + } + return ROTATIONS[index % ROTATIONS.length]; + } + + public static Rotation next(Rotation rotation) { + return cycle(rotation, 1); + } + + public static Rotation previous(Rotation rotation) { + return cycle(rotation, -1); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index 59bd9502..83f66c73 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -21,7 +21,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.enums.DoorHinge; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.BlockStateSupplier; import net.minecraft.data.client.BlockStateVariant; import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.Model; @@ -318,72 +317,40 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { TextureMap topTextures = TextureMap.topBottom(door); TextureMap bottomTextures = topTextures.copyAndAdd(TextureKey.TOP, topTextures.getTexture(TextureKey.BOTTOM)); registerItemModel(door.asItem()); - blockStateCollector.accept(createStableDoorBlockState(door, + var variants = BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN); + fillStableDoorVariantMap(variants, DoubleBlockHalf.LOWER, BlockModels.DOOR_LEFT.upload(door, "_bottom_left", bottomTextures, modelCollector), - BlockModels.DOOR_RIGHT.upload(door, "_bottom_right", bottomTextures, modelCollector), + BlockModels.DOOR_RIGHT.upload(door, "_bottom_right", bottomTextures, modelCollector) + ); + fillStableDoorVariantMap(variants, DoubleBlockHalf.UPPER, BlockModels.DOOR_LEFT.upload(door, "_top_left", topTextures, modelCollector), BlockModels.DOOR_RIGHT.upload(door, "_top_right", topTextures, modelCollector) - )); + ); + blockStateCollector.accept(VariantsBlockStateSupplier.create(door).coordinate(variants)); } - public static BlockStateSupplier createStableDoorBlockState(Block doorBlock, Identifier bottomLeftHingeClosedModelId, Identifier bottomRightHingeClosedModelId, Identifier topLeftHingeClosedModelId, Identifier topRightHingeClosedModelId) { - var variants = BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN); - fillStableDoorVariantMap(variants, DoubleBlockHalf.LOWER, bottomLeftHingeClosedModelId, bottomRightHingeClosedModelId); - fillStableDoorVariantMap(variants, DoubleBlockHalf.UPPER, topLeftHingeClosedModelId, topRightHingeClosedModelId); - return VariantsBlockStateSupplier.create(doorBlock).coordinate(variants); - } - - public static BlockStateVariantMap.QuadrupleProperty fillStableDoorVariantMap( + public static void fillStableDoorVariantMap( BlockStateVariantMap.QuadrupleProperty variantMap, DoubleBlockHalf targetHalf, Identifier leftModelId, Identifier rightModelId) { - return variantMap - .register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId)) - .register(Direction.SOUTH, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R90)) - .register(Direction.WEST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R180)) - .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, false, VariantSettings.Rotation.R0, leftModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, false, VariantSettings.Rotation.R0, rightModelId); - .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId)) - .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R90)) - .register(Direction.WEST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R180)) - .register(Direction.NORTH, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R270)) + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, true, VariantSettings.Rotation.R90, rightModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, true, VariantSettings.Rotation.R270, leftModelId); + } - .register(Direction.EAST, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R90)) - .register(Direction.SOUTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R180)) - .register(Direction.WEST, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R270)) - .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, rightModelId)) + public static void fillStableDoorVariantMap( + BlockStateVariantMap.QuadrupleProperty variantMap, + DoubleBlockHalf targetHalf, + DoorHinge hinge, boolean open, VariantSettings.Rotation rotation, + Identifier modelId) { - .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R270)) - .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId)) - .register(Direction.WEST, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R90)) - .register(Direction.NORTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create() - .put(VariantSettings.MODEL, leftModelId) - .put(VariantSettings.Y, VariantSettings.Rotation.R180)); + for (int i = 0; i < BlockRotation.DIRECTIONS.length; i++) { + variantMap.register(BlockRotation.DIRECTIONS[i], targetHalf, hinge, open, BlockStateVariant.create() + .put(VariantSettings.MODEL, modelId) + .put(VariantSettings.Y, BlockRotation.cycle(rotation, i)) + ); + } } public void registerHiveBlock(Block hive) { From e859c71e4fc2266b18e08560558c3ce5023526c5 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 17 Mar 2024 14:42:26 +0000 Subject: [PATCH 25/44] Datagen plundervine blockstates --- .../unicopia/block/ThornBlock.java | 4 +- .../block/cloud/CloudPillarBlock.java | 5 +- .../datagen/providers/BlockModels.java | 2 + .../datagen/providers/ItemModels.java | 1 + .../providers/UBlockStateModelGenerator.java | 163 ++++++++++++------ .../unicopia/blockstates/cloud_pillar.json | 28 --- .../unicopia/blockstates/plunder_vine.json | 128 -------------- .../blockstates/plunder_vine_bud.json | 10 -- .../models/block/cloud_pillar_end.json | 22 --- ...illar_middle.json => template_pillar.json} | 4 - .../models/block/template_pillar_end.json | 17 ++ .../unicopia/models/item/cloud_pillar.json | 47 ----- .../unicopia/models/item/template_pillar.json | 42 +++++ ...ud_pillar_top.png => cloud_pillar_end.png} | Bin 14 files changed, 173 insertions(+), 300 deletions(-) delete mode 100644 src/main/resources/assets/unicopia/blockstates/cloud_pillar.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/plunder_vine.json delete mode 100644 src/main/resources/assets/unicopia/blockstates/plunder_vine_bud.json delete mode 100644 src/main/resources/assets/unicopia/models/block/cloud_pillar_end.json rename src/main/resources/assets/unicopia/models/block/{cloud_pillar_middle.json => template_pillar.json} (77%) create mode 100644 src/main/resources/assets/unicopia/models/block/template_pillar_end.json delete mode 100644 src/main/resources/assets/unicopia/models/item/cloud_pillar.json create mode 100644 src/main/resources/assets/unicopia/models/item/template_pillar.json rename src/main/resources/assets/unicopia/textures/block/{cloud_pillar_top.png => cloud_pillar_end.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java index a3b6fc32..6d59724a 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java @@ -32,9 +32,9 @@ public class ThornBlock extends ConnectingBlock implements EarthPonyGrowAbility. static final Collection PROPERTIES = FACING_PROPERTIES.values(); static final DirectionProperty FACING = Properties.FACING; static final int MAX_DISTANCE = 25; - static final int MAX_AGE = 4; + static final int MAX_AGE = Properties.AGE_4_MAX; static final IntProperty DISTANCE = IntProperty.of("distance", 0, MAX_DISTANCE); - static final IntProperty AGE = IntProperty.of("age", 0, MAX_AGE); + static final IntProperty AGE = Properties.AGE_4; private final Supplier bud; diff --git a/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java b/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java index 5655b652..69b372b8 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java +++ b/src/main/java/com/minelittlepony/unicopia/block/cloud/CloudPillarBlock.java @@ -12,6 +12,7 @@ import net.minecraft.block.ShapeContext; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -20,8 +21,8 @@ import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; public class CloudPillarBlock extends CloudBlock { - private static final BooleanProperty NORTH = BooleanProperty.of("north"); - private static final BooleanProperty SOUTH = BooleanProperty.of("south"); + private static final BooleanProperty NORTH = Properties.NORTH; + private static final BooleanProperty SOUTH = Properties.SOUTH; private static final Map DIRECTION_PROPERTIES = Map.of( Direction.UP, NORTH, Direction.DOWN, SOUTH diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java index 28c6acd4..68344833 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java @@ -32,6 +32,8 @@ public interface BlockModels { Model OUTER_STAIRS = block("outer_seethrough_stairs", "_outer", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.SIDE, STEP); Model DOOR_LEFT = block("door_left", TextureKey.BOTTOM, TextureKey.TOP); Model DOOR_RIGHT = block("door_right", TextureKey.BOTTOM, TextureKey.TOP); + Model TEMPLATE_PILLAR = block("template_pillar", TextureKey.SIDE); + Model TEMPLATE_PILLAR_END = block("template_pillar_end", "_end", TextureKey.BOTTOM, TextureKey.TOP, TextureKey.END); Factory CROP = Factory.of(TextureMap::crop, Models.CROP); Factory CUBE_ALL = Factory.of(TextureMap::all, Models.CUBE_ALL); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java index 88863bb7..06d35675 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java @@ -24,6 +24,7 @@ interface ItemModels { Model TEMPLATE_EYEWEAR = item("template_eyewear", TextureKey.LAYER0); Model TEMPLATE_SPAWN_EGG = item(new Identifier("template_spawn_egg")); Model TEMPLATE_MUG = item("template_mug", TextureKey.LAYER0); + Model TEMPLATE_PILLAR = item("template_pillar", TextureKey.TOP, TextureKey.BOTTOM, TextureKey.SIDE, TextureKey.END); Model HANDHELD_STAFF = item("handheld_staff", TextureKey.LAYER0); Model TRIDENT_THROWING = item(new Identifier("trident_throwing"), TextureKey.LAYER0); Model TRIDENT_IN_HAND = item(new Identifier("trident_in_hand"), TextureKey.LAYER0); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index 83f66c73..d53ec548 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -18,6 +18,7 @@ import com.minelittlepony.unicopia.server.world.Tree; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.block.ConnectingBlock; import net.minecraft.block.enums.DoorHinge; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.client.BlockStateModelGenerator; @@ -27,10 +28,8 @@ import net.minecraft.data.client.Model; import net.minecraft.data.client.ModelIds; import net.minecraft.data.client.Models; import net.minecraft.data.client.MultipartBlockStateSupplier; -import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; import net.minecraft.data.client.TexturedModel; -import net.minecraft.data.client.VariantSettings; import net.minecraft.data.client.VariantsBlockStateSupplier; import net.minecraft.data.client.When; import net.minecraft.data.family.BlockFamily; @@ -47,6 +46,10 @@ import net.minecraft.util.Pair; import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; +import static net.minecraft.data.client.TextureKey.*; +import static net.minecraft.data.client.VariantSettings.*; +import static net.minecraft.data.client.VariantSettings.Rotation.*; + public class UBlockStateModelGenerator extends BlockStateModelGenerator { static final Identifier AIR_BLOCK_ID = new Identifier("block/air"); static final Identifier AIR_ITEM_ID = new Identifier("item/air"); @@ -85,8 +88,9 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { createCustomTexturePool(UBlocks.DENSE_CLOUD, TexturedModel.CUBE_ALL).slab(UBlocks.DENSE_CLOUD_SLAB).stairs(UBlocks.DENSE_CLOUD_STAIRS); createCustomTexturePool(UBlocks.CLOUD_PLANKS, TexturedModel.CUBE_ALL).slab(UBlocks.CLOUD_PLANK_SLAB).stairs(UBlocks.CLOUD_PLANK_STAIRS); createCustomTexturePool(UBlocks.CLOUD_BRICKS, TexturedModel.CUBE_ALL).slab(UBlocks.CLOUD_BRICK_SLAB).stairs(UBlocks.CLOUD_BRICK_STAIRS); - createTwoStepTexturePool(UBlocks.SOGGY_CLOUD, TexturedModel.CUBE_BOTTOM_TOP.andThen(textures -> textures.put(TextureKey.BOTTOM, ModelIds.getBlockModelId(UBlocks.CLOUD)))).slab(UBlocks.SOGGY_CLOUD_SLAB).stairs(UBlocks.SOGGY_CLOUD_STAIRS); + createTwoStepTexturePool(UBlocks.SOGGY_CLOUD, TexturedModel.CUBE_BOTTOM_TOP.andThen(textures -> textures.put(BOTTOM, ModelIds.getBlockModelId(UBlocks.CLOUD)))).slab(UBlocks.SOGGY_CLOUD_SLAB).stairs(UBlocks.SOGGY_CLOUD_STAIRS); registerRotated(UBlocks.CARVED_CLOUD, TexturedModel.CUBE_COLUMN); + registerPillar(UBlocks.CLOUD_PILLAR); registerAll(UBlockStateModelGenerator::registerCompactedBlock, UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_DENSE_CLOUD, UBlocks.COMPACTED_ETCHED_CLOUD); registerChest(UBlocks.CLOUD_CHEST, UBlocks.CLOUD); @@ -103,7 +107,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerParentedItemModel(UBlocks.SLIME_PUSTULE, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_pod")); blockStateCollector.accept(VariantsBlockStateSupplier.create(UBlocks.SLIME_PUSTULE) .coordinate(BlockStateVariantMap.create(SlimePustuleBlock.SHAPE) - .register(state -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_" + state.asString()))))); + .register(state -> BlockStateVariant.create().put(MODEL, ModelIds.getBlockSubModelId(UBlocks.SLIME_PUSTULE, "_" + state.asString()))))); registerPie(UBlocks.APPLE_PIE); // palm wood @@ -153,7 +157,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, new int[] { 0, 0, 1, 2, 3, 4, 5, 6 } ); - registerParentedItemModel(UBlocks.PLUNDER_VINE_BUD, ModelIds.getBlockModelId(UBlocks.PLUNDER_VINE_BUD)); + registerPlunderVine(UBlocks.PLUNDER_VINE, UBlocks.PLUNDER_VINE_BUD); // leaves registerAll(UBlockStateModelGenerator::registerFloweringLeaves, UBlocks.GREEN_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES); @@ -210,7 +214,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { return (new BlockTexturePool(textures) { @Override public BlockTexturePool stairs(Block block) { - TextureMap textMap = textures.copyAndAdd(BlockModels.STEP, textures.getTexture(TextureKey.SIDE)); + TextureMap textMap = textures.copyAndAdd(BlockModels.STEP, textures.getTexture(SIDE)); Identifier inner = BlockModels.INNER_STAIRS.upload(block, textMap, modelCollector); Identifier straight = BlockModels.STRAIGHT_STAIRS.upload(block, textMap, modelCollector); Identifier outer = BlockModels.OUTER_STAIRS.upload(block, textMap, modelCollector); @@ -240,7 +244,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { @Override public BlockTexturePool slab(Block block) { - TextureMap textMap = textures.copyAndAdd(TextureKey.SIDE, twoStepTexture); + TextureMap textMap = textures.copyAndAdd(SIDE, twoStepTexture); Identifier lower = Models.SLAB.upload(block, textMap, modelCollector); Identifier upper = Models.SLAB_TOP.upload(block, textMap, modelCollector); blockStateCollector.accept(BlockStateModelGenerator.createSlabBlockState(block, lower, upper, baseModelId)); @@ -254,8 +258,8 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { TexturedModel model = TexturedModel.CUBE_BOTTOM_TOP.get(dirt); registerTopSoil(block, model.upload(block, modelCollector), - BlockStateVariant.create().put(VariantSettings.MODEL, Models.CUBE_BOTTOM_TOP.upload(dirt, "_snow", model.getTextures() - .copyAndAdd(TextureKey.SIDE, ModelIds.getBlockSubModelId(dirt, "_side_snow_covered") + BlockStateVariant.create().put(MODEL, Models.CUBE_BOTTOM_TOP.upload(dirt, "_snow", model.getTextures() + .copyAndAdd(SIDE, ModelIds.getBlockSubModelId(dirt, "_side_snow_covered") ), modelCollector)) ); } @@ -264,18 +268,47 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { Identifier outside = ModelIds.getBlockModelId(UBlocks.CHITIN); Identifier inside = ModelIds.getBlockSubModelId(UBlocks.CHITIN, "_bottom"); registerSingleton(UBlocks.CHITIN, new TextureMap() - .put(TextureKey.SIDE, outside) - .put(TextureKey.TOP, outside) - .put(TextureKey.BOTTOM, inside), Models.CUBE_BOTTOM_TOP); + .put(SIDE, outside) + .put(TOP, outside) + .put(BOTTOM, inside), Models.CUBE_BOTTOM_TOP); } public void registerRotated(Block block, TexturedModel.Factory modelFactory) { Identifier modelId = modelFactory.get(block).upload(block, modelCollector); blockStateCollector.accept(VariantsBlockStateSupplier.create(block, BlockStateVariant.create() - .put(VariantSettings.MODEL, modelId)) + .put(MODEL, modelId)) .coordinate(createUpDefaultFacingVariantMap())); } + public void registerPlunderVine(Block plant, Block bud) { + var rotationVariants = BlockStateVariantMap.create(Properties.FACING); + createDownDefaultFacingVariantMap(rotationVariants::register); + blockStateCollector.accept(VariantsBlockStateSupplier.create(bud, BlockStateVariant.create() + .put(MODEL, ModelIds.getBlockModelId(bud))) + .coordinate(rotationVariants)); + + var supplier = MultipartBlockStateSupplier.create(plant); + String[] stages = { "", "_2", "_3", "_4", "_4"}; + Properties.AGE_4.getValues().forEach(age -> { + Identifier modelId = ModelIds.getBlockSubModelId(plant, "_branch" + stages[age]); + createDownDefaultFacingVariantMap((direction, variant) -> { + supplier.with(When.create().set(Properties.AGE_4, age).set(ConnectingBlock.FACING_PROPERTIES.get(direction), true), variant.put(MODEL, modelId)); + }); + }); + + blockStateCollector.accept(supplier); + registerParentedItemModel(bud, ModelIds.getBlockModelId(bud)); + } + + public final void createDownDefaultFacingVariantMap(BiConsumer builder) { + builder.accept(Direction.DOWN, BlockStateVariant.create()); + builder.accept(Direction.UP, BlockStateVariant.create().put(X, R180)); + builder.accept(Direction.SOUTH, BlockStateVariant.create().put(X, R90)); + builder.accept(Direction.NORTH, BlockStateVariant.create().put(X, R90).put(Y, R180)); + builder.accept(Direction.EAST, BlockStateVariant.create().put(X, R90).put(Y, R270)); + builder.accept(Direction.WEST, BlockStateVariant.create().put(X, R90).put(Y, R90)); + } + public void registerCompactedBlock(Block block) { for (Model model : BlockModels.FLATTENED_MODELS) { model.upload(block, TextureMap.all(ModelIds.getBlockModelId(block).withPath(p -> p.replace("compacted_", ""))), modelCollector); @@ -285,18 +318,18 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { final BooleanProperty yAxis = (i & 0b100) == 0 ? Properties.DOWN : Properties.UP; final BooleanProperty xAxis = (i & 0b010) == 0 ? Properties.NORTH: Properties.SOUTH; final BooleanProperty zAxis = (i & 0b001) == 0 ? Properties.EAST : Properties.WEST; - final VariantSettings.Rotation xRot = yAxis == Properties.DOWN ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R180; - final VariantSettings.Rotation yRot = BlockModels.FLATTENED_MODEL_ROTATIONS[i]; + final Rotation xRot = yAxis == Properties.DOWN ? R0 : R180; + final Rotation yRot = BlockModels.FLATTENED_MODEL_ROTATIONS[i]; final String[] suffexes = yRot.ordinal() % 2 == 0 ? BlockModels.FLATTENED_MODEL_SUFFEXES : BlockModels.FLATTENED_MODEL_SUFFEXES_ROT; for (byte v = 0; v < suffexes.length; v++) { supplier.with(When.create() .set(yAxis, (v & 0b100) != 0) .set(xAxis, (v & 0b010) != 0) .set(zAxis, (v & 0b001) != 0), BlockStateVariant.create() - .put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v])) - .put(VariantSettings.UVLOCK, true) - .put(VariantSettings.X, xRot) - .put(VariantSettings.Y, yRot) + .put(MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v])) + .put(UVLOCK, true) + .put(X, xRot) + .put(Y, yRot) ); } } @@ -315,7 +348,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { public void registerStableDoor(Block door) { TextureMap topTextures = TextureMap.topBottom(door); - TextureMap bottomTextures = topTextures.copyAndAdd(TextureKey.TOP, topTextures.getTexture(TextureKey.BOTTOM)); + TextureMap bottomTextures = topTextures.copyAndAdd(TOP, topTextures.getTexture(BOTTOM)); registerItemModel(door.asItem()); var variants = BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN); fillStableDoorVariantMap(variants, DoubleBlockHalf.LOWER, @@ -332,45 +365,61 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { public static void fillStableDoorVariantMap( BlockStateVariantMap.QuadrupleProperty variantMap, DoubleBlockHalf targetHalf, Identifier leftModelId, Identifier rightModelId) { - fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, false, VariantSettings.Rotation.R0, leftModelId); - fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, false, VariantSettings.Rotation.R0, rightModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, false, R0, leftModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, false, R0, rightModelId); - fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, true, VariantSettings.Rotation.R90, rightModelId); - fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, true, VariantSettings.Rotation.R270, leftModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, true, R90, rightModelId); + fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, true, R270, leftModelId); } public static void fillStableDoorVariantMap( BlockStateVariantMap.QuadrupleProperty variantMap, DoubleBlockHalf targetHalf, - DoorHinge hinge, boolean open, VariantSettings.Rotation rotation, + DoorHinge hinge, boolean open, Rotation rotation, Identifier modelId) { for (int i = 0; i < BlockRotation.DIRECTIONS.length; i++) { variantMap.register(BlockRotation.DIRECTIONS[i], targetHalf, hinge, open, BlockStateVariant.create() - .put(VariantSettings.MODEL, modelId) - .put(VariantSettings.Y, BlockRotation.cycle(rotation, i)) + .put(MODEL, modelId) + .put(Y, BlockRotation.cycle(rotation, i)) ); } } + public void registerPillar(Block pillar) { + TextureMap textures = new TextureMap() + .put(SIDE, ModelIds.getBlockSubModelId(pillar, "_side")) + .put(TOP, ModelIds.getBlockSubModelId(pillar, "_lip")) + .put(BOTTOM, ModelIds.getBlockSubModelId(pillar, "_end")) + .put(END, ModelIds.getBlockSubModelId(pillar, "_side_end")); + Identifier middle = BlockModels.TEMPLATE_PILLAR.upload(pillar, textures, modelCollector); + Identifier end = BlockModels.TEMPLATE_PILLAR_END.upload(pillar, textures, modelCollector); + blockStateCollector.accept(MultipartBlockStateSupplier.create(pillar) + .with(BlockStateVariant.create().put(MODEL, middle)) + .with(When.create().set(Properties.NORTH, false), BlockStateVariant.create().put(MODEL, end).put(UVLOCK, true).put(X, R180)) + .with(When.create().set(Properties.SOUTH, false), BlockStateVariant.create().put(MODEL, end)) + ); + ItemModels.TEMPLATE_PILLAR.upload(ModelIds.getItemModelId(pillar.asItem()), textures, modelCollector); + } + public void registerHiveBlock(Block hive) { Identifier core = ModelIds.getBlockSubModelId(hive, "_core"); Identifier side = ModelIds.getBlockSubModelId(hive, "_side"); blockStateCollector.accept(MultipartBlockStateSupplier.create(hive) - .with(BlockStateVariant.create().put(VariantSettings.MODEL, core)) - .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true)) - .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R90)) - .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R180)) - .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.Y, VariantSettings.Rotation.R270)) - .with(When.create().set(Properties.DOWN, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.X, VariantSettings.Rotation.R90)) - .with(When.create().set(Properties.UP, true), BlockStateVariant.create().put(VariantSettings.MODEL, side).put(VariantSettings.UVLOCK, true).put(VariantSettings.X, VariantSettings.Rotation.R270))); + .with(BlockStateVariant.create().put(MODEL, core)) + .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true)) + .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true).put(Y, R90)) + .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true).put(Y, R180)) + .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true).put(Y, R270)) + .with(When.create().set(Properties.DOWN, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true).put(X, R90)) + .with(When.create().set(Properties.UP, true), BlockStateVariant.create().put(MODEL, side).put(UVLOCK, true).put(X, R270))); Models.CUBE_ALL.upload(ModelIds.getItemModelId(hive.asItem()), TextureMap.all(ModelIds.getBlockSubModelId(hive, "_side")), modelCollector); } public void registerBale(Identifier blockId, Identifier baseBlockId, String endSuffex) { Identifier top = baseBlockId.withPath(p -> "block/" + p + endSuffex); Identifier side = baseBlockId.withPath(p -> "block/" + p + "_side"); - TextureMap textures = new TextureMap().put(TextureKey.TOP, top).put(TextureKey.SIDE, side); + TextureMap textures = new TextureMap().put(TOP, top).put(SIDE, side); MultipartBlockStateSupplier supplier = MultipartBlockStateSupplier.create(Registries.BLOCK.getOrEmpty(blockId).orElseGet(() -> { return Registry.register(Registries.BLOCK, blockId, new EdibleBlock(blockId, blockId, false)); @@ -382,11 +431,11 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { BooleanProperty segment = EdibleBlock.SEGMENTS[i]; segment.getName(); supplier.with(When.create().set(EdibleBlock.AXIS, axis).set(segment, true), BlockStateVariant.create() - .put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(i, ii -> { + .put(MODEL, uploadedModels.computeIfAbsent(i, ii -> { return BlockModels.BALE_MODELS[ii].getLeft().upload(blockId.withPath(p -> "block/" + p + BlockModels.BALE_MODELS[ii].getRight()), textures, modelCollector); })) - .put(VariantSettings.X, axis == Direction.Axis.Y ? VariantSettings.Rotation.R0 : VariantSettings.Rotation.R90) - .put(VariantSettings.Y, axis == Direction.Axis.X ? VariantSettings.Rotation.R90 : VariantSettings.Rotation.R0) + .put(X, axis == Direction.Axis.Y ? R0 : R90) + .put(Y, axis == Direction.Axis.X ? R90 : R0) ); } } @@ -402,7 +451,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { Int2ObjectOpenHashMap uploadedModels = new Int2ObjectOpenHashMap<>(); blockStateCollector.accept(VariantsBlockStateSupplier.create(crop) .coordinate(BlockStateVariantMap.create(ageProperty) - .register(age -> BlockStateVariant.create().put(VariantSettings.MODEL, uploadedModels.computeIfAbsent(stages[age - offset], stage -> { + .register(age -> BlockStateVariant.create().put(MODEL, uploadedModels.computeIfAbsent(stages[age - offset], stage -> { return modelFactory.upload(crop, "_stage" + stage, modelCollector); }))))); } @@ -414,7 +463,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { int offset = ageProperty.getValues().iterator().next(); blockStateCollector.accept(VariantsBlockStateSupplier.create(crop) .coordinate(BlockStateVariantMap.create(ageProperty) - .register(age -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(crop, "_stage" + stages[age - offset]))))); + .register(age -> BlockStateVariant.create().put(MODEL, ModelIds.getBlockSubModelId(crop, "_stage" + stages[age - offset]))))); } public & StringIdentifiable> void registerTallCrop(Block crop, @@ -425,28 +474,28 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { blockStateCollector.accept(VariantsBlockStateSupplier.create(crop).coordinate(BlockStateVariantMap.create(partProperty, ageProperty).register((part, age) -> { int i = ageTextureIndices[part.ordinal()][age]; Identifier identifier = uploadedModels.computeIfAbsent("_" + part.asString() + "_stage" + i, variant -> createSubModel(crop, variant, Models.CROSS, TextureMap::cross)); - return BlockStateVariant.create().put(VariantSettings.MODEL, identifier); + return BlockStateVariant.create().put(MODEL, identifier); }))); } public void registerPie(Block pie) { TextureMap textures = new TextureMap() - .put(TextureKey.TOP, ModelIds.getBlockSubModelId(pie, "_top")) - .put(TextureKey.BOTTOM, ModelIds.getBlockSubModelId(pie, "_bottom")) - .put(TextureKey.SIDE, ModelIds.getBlockSubModelId(pie, "_side")) - .put(TextureKey.INSIDE, ModelIds.getBlockSubModelId(pie, "_inside")); - TextureMap stompedTextures = textures.copyAndAdd(TextureKey.TOP, ModelIds.getBlockSubModelId(pie, "_top_stomped")); + .put(TOP, ModelIds.getBlockSubModelId(pie, "_top")) + .put(BOTTOM, ModelIds.getBlockSubModelId(pie, "_bottom")) + .put(SIDE, ModelIds.getBlockSubModelId(pie, "_side")) + .put(INSIDE, ModelIds.getBlockSubModelId(pie, "_inside")); + TextureMap stompedTextures = textures.copyAndAdd(TOP, ModelIds.getBlockSubModelId(pie, "_top_stomped")); blockStateCollector.accept(VariantsBlockStateSupplier.create(pie).coordinate(BlockStateVariantMap.create(PieBlock.BITES, PieBlock.STOMPED).register((bites, stomped) -> { - return BlockStateVariant.create().put(VariantSettings.MODEL, BlockModels.PIE_MODELS[bites].upload(pie, (stomped ? "_stomped" : ""), stomped ? stompedTextures : textures, modelCollector)); + return BlockStateVariant.create().put(MODEL, BlockModels.PIE_MODELS[bites].upload(pie, (stomped ? "_stomped" : ""), stomped ? stompedTextures : textures, modelCollector)); }))); } public void registerFloweringLeaves(Block block) { Identifier baseModel = TexturedModel.LEAVES.upload(block, modelCollector); - Identifier floweringModel = Models.CUBE_ALL.upload(block, "_flowering", TextureMap.of(TextureKey.ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelCollector); + Identifier floweringModel = Models.CUBE_ALL.upload(block, "_flowering", TextureMap.of(ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelCollector); blockStateCollector.accept(MultipartBlockStateSupplier.create(block) - .with(BlockStateVariant.create().put(VariantSettings.MODEL, baseModel)) - .with(When.create().set(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.FLOWERING), BlockStateVariant.create().put(VariantSettings.MODEL, floweringModel))); + .with(BlockStateVariant.create().put(MODEL, baseModel)) + .with(When.create().set(FruitBearingBlock.STAGE, FruitBearingBlock.Stage.FLOWERING), BlockStateVariant.create().put(MODEL, floweringModel))); } public void registerZapLeaves(Block block) { @@ -456,7 +505,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { blockStateCollector.accept(VariantsBlockStateSupplier.create(block) .coordinate(BlockStateVariantMap.create(ZapAppleLeavesBlock.STAGE) .register(stage -> BlockStateVariant.create() - .put(VariantSettings.MODEL, switch (stage) { + .put(MODEL, switch (stage) { case HIBERNATING -> airModel; case FLOWERING -> floweringModel; default -> baseModel; @@ -467,23 +516,23 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { blockStateCollector.accept(VariantsBlockStateSupplier.create(sprout) .coordinate(BlockStateVariantMap.create(Properties.AGE_7) .register(age -> BlockStateVariant.create() - .put(VariantSettings.MODEL, Unicopia.id("block/apple_sprout_stage" + age))))); + .put(MODEL, Unicopia.id("block/apple_sprout_stage" + age))))); } public void registerShell(Block shell) { blockStateCollector.accept(VariantsBlockStateSupplier.create(shell) .coordinate(BlockStateVariantMap.create(ShellsBlock.COUNT) .register(count -> BlockStateVariant.create() - .put(VariantSettings.MODEL, BlockModels.SHELL_MODELS[count - 1].upload(shell, TextureMap.of(BlockModels.SHELL, Registries.BLOCK.getId(shell).withPrefixedPath("item/")), modelCollector))))); + .put(MODEL, BlockModels.SHELL_MODELS[count - 1].upload(shell, TextureMap.of(BlockModels.SHELL, Registries.BLOCK.getId(shell).withPrefixedPath("item/")), modelCollector))))); } public void registerHull(Block block, Block core, Block shell) { blockStateCollector.accept(VariantsBlockStateSupplier.create( block, - BlockStateVariant.create().put(VariantSettings.MODEL, Models.CUBE_BOTTOM_TOP.upload(block, new TextureMap() - .put(TextureKey.BOTTOM, ModelIds.getBlockModelId(core)) - .put(TextureKey.TOP, ModelIds.getBlockModelId(shell)) - .put(TextureKey.SIDE, ModelIds.getBlockSubModelId(shell, "_half")), modelCollector)) + BlockStateVariant.create().put(MODEL, Models.CUBE_BOTTOM_TOP.upload(block, new TextureMap() + .put(BOTTOM, ModelIds.getBlockModelId(core)) + .put(TOP, ModelIds.getBlockModelId(shell)) + .put(SIDE, ModelIds.getBlockSubModelId(shell, "_half")), modelCollector)) ).coordinate(createUpDefaultFacingVariantMap())); } } diff --git a/src/main/resources/assets/unicopia/blockstates/cloud_pillar.json b/src/main/resources/assets/unicopia/blockstates/cloud_pillar.json deleted file mode 100644 index 46dafadc..00000000 --- a/src/main/resources/assets/unicopia/blockstates/cloud_pillar.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "unicopia:block/cloud_pillar_middle" - } - }, - { - "apply": { - "model": "unicopia:block/cloud_pillar_end", - "uvlock": true, - "x": 180 - }, - "when": { - "north": false - } - }, - { - "apply": { - "model": "unicopia:block/cloud_pillar_end", - "uvlock": true - }, - "when": { - "south": false - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/plunder_vine.json b/src/main/resources/assets/unicopia/blockstates/plunder_vine.json deleted file mode 100644 index 87b7ee61..00000000 --- a/src/main/resources/assets/unicopia/blockstates/plunder_vine.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "multipart": [ - { - "apply": { "model": "unicopia:block/plunder_vine_branch" }, - "when": { "age": 0, "down": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch", "x": 180 }, - "when": { "age": 0, "up": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch", "x": 90 }, - "when": { "age": 0, "south": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch", "x": 90, "y": 90 }, - "when": { "age": 0, "west": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch", "x": 90, "y": 180 }, - "when": { "age": 0, "north": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch", "x": 90, "y": 270 }, - "when": { "age": 0, "east": true } - }, - - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2" }, - "when": { "age": 1, "down": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2", "x": 180 }, - "when": { "age": 1, "up": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2", "x": 90 }, - "when": { "age": 1, "south": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2", "x": 90, "y": 90 }, - "when": { "age": 1, "west": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2", "x": 90, "y": 180 }, - "when": { "age": 1, "north": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_2", "x": 90, "y": 270 }, - "when": { "age": 1, "east": true } - }, - - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3" }, - "when": { "age": 2, "down": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3", "x": 180 }, - "when": { "age": 2, "up": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3", "x": 90 }, - "when": { "age": 2, "south": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3", "x": 90, "y": 90 }, - "when": { "age": 2, "west": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3", "x": 90, "y": 180 }, - "when": { "age": 2, "north": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_3", "x": 90, "y": 270 }, - "when": { "age": 2, "east": true } - }, - - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4" }, - "when": { "age": 3, "down": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 180 }, - "when": { "age": 3, "up": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90 }, - "when": { "age": 3, "south": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 90 }, - "when": { "age": 3, "west": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 180 }, - "when": { "age": 3, "north": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 270 }, - "when": { "age": 3, "east": true } - }, - - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4" }, - "when": { "age": 4, "down": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 180 }, - "when": { "age": 4, "up": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90 }, - "when": { "age": 4, "south": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 90 }, - "when": { "age": 4, "west": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 180 }, - "when": { "age": 4, "north": true } - }, - { - "apply": { "model": "unicopia:block/plunder_vine_branch_4", "x": 90, "y": 270 }, - "when": { "age": 4, "east": true } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/blockstates/plunder_vine_bud.json b/src/main/resources/assets/unicopia/blockstates/plunder_vine_bud.json deleted file mode 100644 index bf21be63..00000000 --- a/src/main/resources/assets/unicopia/blockstates/plunder_vine_bud.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=down": { "model": "unicopia:block/plunder_vine_bud" }, - "facing=up": { "model": "unicopia:block/plunder_vine_bud", "x": 180 }, - "facing=south": { "model": "unicopia:block/plunder_vine_bud", "x": 90 }, - "facing=west": { "model": "unicopia:block/plunder_vine_bud", "x": 90, "y": 90 }, - "facing=north": { "model": "unicopia:block/plunder_vine_bud", "x": 90, "y": 180 }, - "facing=east": { "model": "unicopia:block/plunder_vine_bud", "x": 90, "y": 270 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/block/cloud_pillar_end.json b/src/main/resources/assets/unicopia/models/block/cloud_pillar_end.json deleted file mode 100644 index 61ddef4d..00000000 --- a/src/main/resources/assets/unicopia/models/block/cloud_pillar_end.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "unicopia:block/cloud_pillar_lip", - "bottom": "unicopia:block/cloud_pillar_top", - "side": "unicopia:block/cloud_pillar_side_end" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 5, 16], - "faces": { - "north": {"uv": [0, 11, 16, 16], "texture": "#side", "cullface": "north"}, - "east": {"uv": [0, 11, 16, 16], "texture": "#side", "cullface": "east"}, - "south": {"uv": [0, 11, 16, 16], "texture": "#side", "cullface": "south"}, - "west": {"uv": [0, 11, 16, 16], "texture": "#side", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/cloud_pillar_middle.json b/src/main/resources/assets/unicopia/models/block/template_pillar.json similarity index 77% rename from src/main/resources/assets/unicopia/models/block/cloud_pillar_middle.json rename to src/main/resources/assets/unicopia/models/block/template_pillar.json index 1244868f..7a9d9fce 100644 --- a/src/main/resources/assets/unicopia/models/block/cloud_pillar_middle.json +++ b/src/main/resources/assets/unicopia/models/block/template_pillar.json @@ -1,9 +1,5 @@ { "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "unicopia:block/cloud_pillar_top", - "side": "unicopia:block/cloud_pillar_side" - }, "elements": [ { "from": [1, 0, 1], diff --git a/src/main/resources/assets/unicopia/models/block/template_pillar_end.json b/src/main/resources/assets/unicopia/models/block/template_pillar_end.json new file mode 100644 index 00000000..b09a0174 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/block/template_pillar_end.json @@ -0,0 +1,17 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [0, 11, 16, 16], "texture": "#end", "cullface": "north"}, + "east": {"uv": [0, 11, 16, 16], "texture": "#end", "cullface": "east"}, + "south": {"uv": [0, 11, 16, 16], "texture": "#end", "cullface": "south"}, + "west": {"uv": [0, 11, 16, 16], "texture": "#end", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + } + ] +} diff --git a/src/main/resources/assets/unicopia/models/item/cloud_pillar.json b/src/main/resources/assets/unicopia/models/item/cloud_pillar.json deleted file mode 100644 index d2e686fd..00000000 --- a/src/main/resources/assets/unicopia/models/item/cloud_pillar.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "unicopia:block/cloud_pillar_top", - "side": "unicopia:block/cloud_pillar_side", - "side_end": "unicopia:block/cloud_pillar_side_end", - "particle": "#side" - }, - "elements": [ - { - "from": [2, 1, 2], - "to": [14, 15, 14], - "faces": { - "north": {"uv": [1, 0, 15, 16], "texture": "#side"}, - "east": {"uv": [1, 0, 15, 16], "texture": "#side"}, - "south": {"uv": [1, 0, 15, 16], "texture": "#side"}, - "west": {"uv": [1, 0, 15, 16], "texture": "#side"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#top"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#top"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 5, 16], - "faces": { - "north": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "east": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "south": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "west": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - }, - { - "from": [0, 11, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "east": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "south": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "west": {"uv": [0, 11, 16, 16], "texture": "#side_end"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/models/item/template_pillar.json b/src/main/resources/assets/unicopia/models/item/template_pillar.json new file mode 100644 index 00000000..871940d2 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/template_pillar.json @@ -0,0 +1,42 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "particle": "#side" + }, + "elements": [ + { + "from": [2, 1, 2], + "to": [14, 15, 14], + "faces": { + "north": {"uv": [1, 0, 15, 16], "texture": "#side"}, + "east": {"uv": [1, 0, 15, 16], "texture": "#side"}, + "south": {"uv": [1, 0, 15, 16], "texture": "#side"}, + "west": {"uv": [1, 0, 15, 16], "texture": "#side"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "east": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "south": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "west": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + } + }, + { + "from": [0, 11, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "east": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "south": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "west": {"uv": [0, 11, 16, 16], "texture": "#end"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/unicopia/textures/block/cloud_pillar_top.png b/src/main/resources/assets/unicopia/textures/block/cloud_pillar_end.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/block/cloud_pillar_top.png rename to src/main/resources/assets/unicopia/textures/block/cloud_pillar_end.png From 86cc754a7d08e06a0f1cbcc104c0f2d5b5a82baf Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 17 Mar 2024 14:42:41 +0000 Subject: [PATCH 26/44] Remove collission from plunder vine buds --- src/main/java/com/minelittlepony/unicopia/block/UBlocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java index 88a019c3..1c45b8a8 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java +++ b/src/main/java/com/minelittlepony/unicopia/block/UBlocks.java @@ -175,7 +175,7 @@ public interface UBlocks { SegmentedCropBlock OATS_CROWN = register("oats_crown", OATS_STEM.createNext(5)); Block PLUNDER_VINE = register("plunder_vine", new ThornBlock(Settings.create().mapColor(MapColor.DARK_CRIMSON).hardness(1).ticksRandomly().sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY), () -> UBlocks.PLUNDER_VINE_BUD)); - Block PLUNDER_VINE_BUD = register("plunder_vine_bud", new ThornBudBlock(Settings.create().mapColor(MapColor.DARK_CRIMSON).hardness(1).nonOpaque().ticksRandomly().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY), PLUNDER_VINE.getDefaultState())); + Block PLUNDER_VINE_BUD = register("plunder_vine_bud", new ThornBudBlock(Settings.create().mapColor(MapColor.DARK_CRIMSON).hardness(1).nonOpaque().ticksRandomly().noCollision().sounds(BlockSoundGroup.GRASS).pistonBehavior(PistonBehavior.DESTROY), PLUNDER_VINE.getDefaultState())); CuringJokeBlock CURING_JOKE = register("curing_joke", new CuringJokeBlock(UEffects.BUTTER_FINGERS, 7, AbstractBlock.Settings.create().mapColor(MapColor.PALE_PURPLE).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XZ).pistonBehavior(PistonBehavior.DESTROY))); Block GOLD_ROOT = register("gold_root", new CarrotsBlock(AbstractBlock.Settings.create().mapColor(MapColor.GOLD).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP).pistonBehavior(PistonBehavior.DESTROY)) { @Override From 9d59c89ac2d918162f89f854211c419f6cc59021 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 17 Mar 2024 15:14:03 +0000 Subject: [PATCH 27/44] Move seasons stuff to datagen --- .../providers/SeasonsModelGenerator.java | 34 ++++++++++++ .../providers/UBlockStateModelGenerator.java | 49 ++++++++++++------ .../datagen/providers/UModelProvider.java | 2 +- .../seasons/models/block/oats_stage0.json | 13 ----- .../seasons/models/block/oats_stage1.json | 13 ----- .../models/block/oats_stage10_lower.json | 13 ----- .../models/block/oats_stage10_mid.json | 13 ----- .../models/block/oats_stage10_upper.json | 13 ----- .../models/block/oats_stage11_lower.json | 13 ----- .../models/block/oats_stage11_mid.json | 13 ----- .../models/block/oats_stage11_upper.json | 13 ----- .../seasons/models/block/oats_stage2.json | 13 ----- .../seasons/models/block/oats_stage3.json | 13 ----- .../seasons/models/block/oats_stage4.json | 13 ----- .../models/block/oats_stage5_lower.json | 13 ----- .../models/block/oats_stage5_upper.json | 13 ----- .../models/block/oats_stage6_lower.json | 13 ----- .../models/block/oats_stage6_upper.json | 13 ----- .../models/block/oats_stage7_lower.json | 13 ----- .../models/block/oats_stage7_upper.json | 13 ----- .../models/block/oats_stage8_lower.json | 13 ----- .../models/block/oats_stage8_upper.json | 13 ----- .../models/block/oats_stage9_lower.json | 13 ----- .../models/block/oats_stage9_upper.json | 13 ----- .../seasons/models/item/oat_seeds.json | 13 ----- .../unicopia/seasons/models/item/oats.json | 13 ----- .../{ => seasons/fall}/fall_oat_seeds.png | Bin .../item/{ => seasons/fall}/fall_oats.png | Bin .../{ => seasons/summer}/summer_oat_seeds.png | Bin .../item/{ => seasons/summer}/summer_oats.png | Bin .../{ => seasons/winter}/winter_oat_seeds.png | Bin .../item/{ => seasons/winter}/winter_oats.png | Bin 32 files changed, 67 insertions(+), 317 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage0.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage1.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_mid.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_mid.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage2.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage3.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage4.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_lower.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_upper.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/item/oat_seeds.json delete mode 100644 src/main/resources/assets/unicopia/seasons/models/item/oats.json rename src/main/resources/assets/unicopia/textures/item/{ => seasons/fall}/fall_oat_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/item/{ => seasons/fall}/fall_oats.png (100%) rename src/main/resources/assets/unicopia/textures/item/{ => seasons/summer}/summer_oat_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/item/{ => seasons/summer}/summer_oats.png (100%) rename src/main/resources/assets/unicopia/textures/item/{ => seasons/winter}/winter_oat_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/item/{ => seasons/winter}/winter_oats.png (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java new file mode 100644 index 00000000..d1adf6a1 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java @@ -0,0 +1,34 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import com.google.gson.JsonObject; + +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.util.Identifier; + +class SeasonsModelGenerator { + private static final String[] SEASONS = { "fall", "summer", "winter" }; + + static UBlockStateModelGenerator create(BlockStateModelGenerator modelGenerator) { + return new UBlockStateModelGenerator(modelGenerator.blockStateCollector, (id, jsonSupplier) -> { + modelGenerator.modelCollector.accept(id, jsonSupplier); + modelGenerator.modelCollector.accept(id.withPrefixedPath("seasons/"), () -> { + JsonObject textures = jsonSupplier.get().getAsJsonObject().getAsJsonObject("textures"); + JsonObject seasonTextures = new JsonObject(); + for (String season : SEASONS) { + seasonTextures.add(season, createTextures(season, textures)); + } + JsonObject model = new JsonObject(); + model.add("textures", seasonTextures); + return model; + }); + }, modelGenerator::excludeFromSimpleItemModelGeneration); + } + + private static JsonObject createTextures(String season, JsonObject input) { + JsonObject textures = new JsonObject(); + input.entrySet().forEach(entry -> { + textures.addProperty(entry.getKey(), new Identifier(entry.getValue().getAsString()).withPath(path -> path.replace("/", "/seasons/" + season + "/")).toString()); + }); + return textures; + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index d53ec548..2d89a5e7 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -3,6 +3,10 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; + +import com.google.gson.JsonElement; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.block.EdibleBlock; import com.minelittlepony.unicopia.block.FruitBearingBlock; @@ -22,6 +26,7 @@ import net.minecraft.block.ConnectingBlock; import net.minecraft.block.enums.DoorHinge; import net.minecraft.block.enums.DoubleBlockHalf; import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateSupplier; import net.minecraft.data.client.BlockStateVariant; import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.Model; @@ -55,27 +60,33 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { static final Identifier AIR_ITEM_ID = new Identifier("item/air"); static UBlockStateModelGenerator create(BlockStateModelGenerator modelGenerator) { - return new UBlockStateModelGenerator(modelGenerator); + return new UBlockStateModelGenerator(modelGenerator.blockStateCollector, modelGenerator.modelCollector, modelGenerator::excludeFromSimpleItemModelGeneration); } - private UBlockStateModelGenerator(BlockStateModelGenerator modelGenerator) { - super(modelGenerator.blockStateCollector, - (id, jsonSupplier) -> { - if (AIR_BLOCK_ID.equals(id) || AIR_ITEM_ID.equals(id)) { - throw new IllegalStateException("Registered air id for block model: " + jsonSupplier.get().toString()); - } - modelGenerator.modelCollector.accept(id, jsonSupplier); - }, - item -> modelGenerator.excludeFromSimpleItemModelGeneration(Block.getBlockFromItem(item)) - ); + protected UBlockStateModelGenerator(BlockStateModelGenerator modelGenerator) { + this(modelGenerator.blockStateCollector, modelGenerator.modelCollector, modelGenerator::excludeFromSimpleItemModelGeneration); + } - for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { - Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelCollector); - } + public UBlockStateModelGenerator( + Consumer blockStateCollector, + BiConsumer> modelCollector, + Consumer simpleItemModelExemptionCollector) { + super(blockStateCollector, (id, jsonSupplier) -> { + if (AIR_BLOCK_ID.equals(id) || AIR_ITEM_ID.equals(id)) { + throw new IllegalStateException("Registered air id for block model: " + jsonSupplier.get().toString()); + } + modelCollector.accept(id, jsonSupplier); + }, item -> simpleItemModelExemptionCollector.accept(Block.getBlockFromItem(item))); } @Override public void register() { + UBlockStateModelGenerator seasonsModelGenerator = SeasonsModelGenerator.create(this); + + for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { + Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelCollector); + } + // handmade registerAll((g, block) -> g.registerParentedItemModel(block, ModelIds.getBlockModelId(block)), UBlocks.SHAPING_BENCH, UBlocks.SURFACE_CHITIN); registerAll(UBlockStateModelGenerator::registerSimpleState, UBlocks.SHAPING_BENCH, UBlocks.BANANAS); @@ -150,9 +161,13 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED)); registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); registerWithStages(UBlocks.GOLD_ROOT, Properties.AGE_7, BlockModels.CROP, 0, 0, 1, 1, 2, 2, 2, 3); - registerWithStages(UBlocks.OATS, UBlocks.OATS.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); - registerWithStages(UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6); - registerWithStages(UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), BlockModels.CROP, 0, 1); + seasonsModelGenerator.registerWithStages(UBlocks.OATS, UBlocks.OATS.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + seasonsModelGenerator.registerWithStages(UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6); + seasonsModelGenerator.registerWithStages(UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), BlockModels.CROP, 0, 1); + + seasonsModelGenerator.registerItemModel(UItems.OATS); + seasonsModelGenerator.registerItemModel(UItems.OAT_SEEDS); + registerTallCrop(UBlocks.PINEAPPLE, Properties.AGE_7, Properties.BLOCK_HALF, new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, new int[] { 0, 0, 1, 2, 3, 4, 5, 6 } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index b864b076..394a45ba 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -41,7 +41,7 @@ public class UModelProvider extends FabricModelProvider { UItems.JAM_TOAST, UItems.JUICE, UItems.LIGHTNING_JAR, UItems.MANGO, UItems.MUFFIN, - UItems.OAT_SEEDS, UItems.OATMEAL, UItems.OATS, + UItems.OATMEAL, UItems.PEBBLES, UItems.PEGASUS_FEATHER, UItems.PINECONE, UItems.PINEAPPLE_CROWN, UItems.RAIN_CLOUD_JAR, UItems.ROCK_STEW, UItems.ROCK, UItems.ROTTEN_APPLE, UItems.SALT_CUBE, UItems.SCALLOP_SHELL, UItems.SHELLY, UItems.SOUR_APPLE_SEEDS, UItems.SOUR_APPLE, UItems.SPELLBOOK, UItems.STORM_CLOUD_JAR, diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage0.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage0.json deleted file mode 100644 index db42d773..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage0.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage0" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage0" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage0" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage1.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage1.json deleted file mode 100644 index 76ea5a37..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage1.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage1" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage1" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage1" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_lower.json deleted file mode 100644 index 76ce2472..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage10_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage10_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage10_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_mid.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_mid.json deleted file mode 100644 index 5fdecd9f..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_mid.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage10_mid" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage10_mid" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage10_mid" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_upper.json deleted file mode 100644 index f558c96a..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage10_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage10_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage10_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage10_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_lower.json deleted file mode 100644 index f6b2a41b..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage11_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage11_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage11_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_mid.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_mid.json deleted file mode 100644 index 2f29df3b..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_mid.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage11_mid" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage11_mid" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage11_mid" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_upper.json deleted file mode 100644 index 5fac5700..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage11_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage11_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage11_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage11_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage2.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage2.json deleted file mode 100644 index 3b7fbf87..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage2.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage2" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage2" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage2" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage3.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage3.json deleted file mode 100644 index 5a400e01..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage3.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage3" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage3" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage3" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage4.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage4.json deleted file mode 100644 index b22aa7ff..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage4.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage4" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage4" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage4" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_lower.json deleted file mode 100644 index 0995733e..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage5_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage5_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage5_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_upper.json deleted file mode 100644 index 4ce4305f..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage5_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage5_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage5_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage5_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_lower.json deleted file mode 100644 index 6942f1d1..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage6_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage6_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage6_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_upper.json deleted file mode 100644 index 0a74e651..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage6_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage6_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage6_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage6_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_lower.json deleted file mode 100644 index 10e419b5..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage7_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage7_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage7_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_upper.json deleted file mode 100644 index fb354a49..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage7_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage7_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage7_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage7_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_lower.json deleted file mode 100644 index 17fd8eb2..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage8_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage8_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage8_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_upper.json deleted file mode 100644 index 0fc4ebed..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage8_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage8_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage8_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage8_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_lower.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_lower.json deleted file mode 100644 index 14ac5a31..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_lower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage9_lower" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage9_lower" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage9_lower" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_upper.json b/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_upper.json deleted file mode 100644 index 5d5e68bc..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/block/oats_stage9_upper.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "crop": "unicopia:block/summer_oats_stage9_upper" - }, - "fall": { - "crop": "unicopia:block/fall_oats_stage9_upper" - }, - "winter": { - "crop": "unicopia:block/winter_oats_stage9_upper" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/item/oat_seeds.json b/src/main/resources/assets/unicopia/seasons/models/item/oat_seeds.json deleted file mode 100644 index b098c5cf..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/item/oat_seeds.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "layer0": "unicopia:item/summer_oat_seeds" - }, - "fall": { - "layer0": "unicopia:item/fall_oat_seeds" - }, - "winter": { - "layer0": "unicopia:item/winter_oat_seeds" - } - } -} diff --git a/src/main/resources/assets/unicopia/seasons/models/item/oats.json b/src/main/resources/assets/unicopia/seasons/models/item/oats.json deleted file mode 100644 index 7066a0e5..00000000 --- a/src/main/resources/assets/unicopia/seasons/models/item/oats.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "textures": { - "summer": { - "layer0": "unicopia:item/summer_oats" - }, - "fall": { - "layer0": "unicopia:item/fall_oats" - }, - "winter": { - "layer0": "unicopia:item/winter_oats" - } - } -} diff --git a/src/main/resources/assets/unicopia/textures/item/fall_oat_seeds.png b/src/main/resources/assets/unicopia/textures/item/seasons/fall/fall_oat_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/fall_oat_seeds.png rename to src/main/resources/assets/unicopia/textures/item/seasons/fall/fall_oat_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/item/fall_oats.png b/src/main/resources/assets/unicopia/textures/item/seasons/fall/fall_oats.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/fall_oats.png rename to src/main/resources/assets/unicopia/textures/item/seasons/fall/fall_oats.png diff --git a/src/main/resources/assets/unicopia/textures/item/summer_oat_seeds.png b/src/main/resources/assets/unicopia/textures/item/seasons/summer/summer_oat_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/summer_oat_seeds.png rename to src/main/resources/assets/unicopia/textures/item/seasons/summer/summer_oat_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/item/summer_oats.png b/src/main/resources/assets/unicopia/textures/item/seasons/summer/summer_oats.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/summer_oats.png rename to src/main/resources/assets/unicopia/textures/item/seasons/summer/summer_oats.png diff --git a/src/main/resources/assets/unicopia/textures/item/winter_oat_seeds.png b/src/main/resources/assets/unicopia/textures/item/seasons/winter/winter_oat_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/winter_oat_seeds.png rename to src/main/resources/assets/unicopia/textures/item/seasons/winter/winter_oat_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/item/winter_oats.png b/src/main/resources/assets/unicopia/textures/item/seasons/winter/winter_oats.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/item/winter_oats.png rename to src/main/resources/assets/unicopia/textures/item/seasons/winter/winter_oats.png From 7d1d2f45da13c5b5546d4b0e364f8df1bd82d521 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 18 Mar 2024 17:11:16 +0000 Subject: [PATCH 28/44] Set up tags and loot tables generation --- .../unicopia/datagen/Datagen.java | 23 +++ .../providers/UBlockLootTableProvider.java | 131 ++++++++++++++ .../providers/UBlockStateModelGenerator.java | 9 +- .../datagen/providers/UBlockTagProvider.java | 167 ++++++++++++++++++ .../datagen/providers/UItemTagProvider.java | 59 +++++++ .../datagen/providers/UModelProvider.java | 13 ++ .../data/minecraft/tags/blocks/crops.json | 7 - .../minecraft/tags/blocks/dragon_immune.json | 8 - .../data/minecraft/tags/blocks/fire.json | 6 - .../data/minecraft/tags/blocks/leaves.json | 13 -- .../data/minecraft/tags/blocks/logs.json | 18 -- .../minecraft/tags/blocks/logs_that_burn.json | 14 -- .../tags/blocks/maintains_farmland.json | 14 -- .../minecraft/tags/blocks/mineable/axe.json | 10 -- .../minecraft/tags/blocks/mineable/hoe.json | 16 -- .../tags/blocks/mineable/pickaxe.json | 18 -- .../tags/blocks/mineable/shovel.json | 7 - .../tags/blocks/needs_diamond_tool.json | 6 - .../minecraft/tags/blocks/piglin_loved.json | 8 - .../data/minecraft/tags/blocks/planks.json | 7 - .../data/minecraft/tags/blocks/saplings.json | 6 - .../minecraft/tags/blocks/standing_signs.json | 6 - .../minecraft/tags/blocks/wall_signs.json | 6 - .../minecraft/tags/blocks/wooden_buttons.json | 6 - .../minecraft/tags/blocks/wooden_doors.json | 6 - .../tags/blocks/wooden_fence_gates.json | 8 - .../minecraft/tags/blocks/wooden_fences.json | 8 - .../tags/blocks/wooden_pressure_plates.json | 6 - .../minecraft/tags/blocks/wooden_slabs.json | 8 - .../minecraft/tags/blocks/wooden_stairs.json | 8 - .../tags/blocks/wooden_trapdoors.json | 6 - .../data/minecraft/tags/items/beds.json | 7 - .../minecraft/tags/items/bookshelf_books.json | 6 - .../minecraft/tags/items/chest_boats.json | 6 - .../tags/items/creeper_drop_music_discs.json | 9 - .../minecraft/tags/items/fence_gates.json | 8 - .../minecraft/tags/items/hanging_signs.json | 6 - .../data/minecraft/tags/items/leaves.json | 11 -- .../data/minecraft/tags/items/logs.json | 17 -- .../minecraft/tags/items/logs_that_burn.json | 17 -- .../minecraft/tags/items/music_discs.json | 9 - .../minecraft/tags/items/piglin_loved.json | 9 - .../data/minecraft/tags/items/planks.json | 7 - .../data/minecraft/tags/items/saplings.json | 11 -- .../data/minecraft/tags/items/signs.json | 6 - .../data/minecraft/tags/items/slabs.json | 6 - .../data/minecraft/tags/items/stairs.json | 6 - .../data/minecraft/tags/items/tools.json | 7 - .../minecraft/tags/items/wooden_buttons.json | 6 - .../minecraft/tags/items/wooden_doors.json | 8 - .../minecraft/tags/items/wooden_fences.json | 8 - .../tags/items/wooden_pressure_plates.json | 6 - .../minecraft/tags/items/wooden_slabs.json | 8 - .../minecraft/tags/items/wooden_stairs.json | 8 - .../tags/items/wooden_trapdoors.json | 6 - .../loot_tables/blocks/carved_cloud.json | 20 --- .../loot_tables/blocks/chiselled_chitin.json | 20 --- .../blocks/chiselled_chitin_slab.json | 36 ---- .../blocks/chiselled_chitin_stairs.json | 20 --- .../unicopia/loot_tables/blocks/chitin.json | 27 --- .../loot_tables/blocks/chitin_spikes.json | 27 --- .../loot_tables/blocks/cloth_bed.json | 29 --- .../unicopia/loot_tables/blocks/cloud.json | 27 --- .../loot_tables/blocks/cloud_bed.json | 29 --- .../loot_tables/blocks/cloud_brick_slab.json | 36 ---- .../blocks/cloud_brick_stairs.json | 20 --- .../loot_tables/blocks/cloud_bricks.json | 20 --- .../loot_tables/blocks/cloud_door.json | 29 --- .../loot_tables/blocks/cloud_pillar.json | 27 --- .../loot_tables/blocks/cloud_plank_slab.json | 36 ---- .../blocks/cloud_plank_stairs.json | 20 --- .../loot_tables/blocks/cloud_planks.json | 20 --- .../loot_tables/blocks/cloud_stairs.json | 27 --- .../loot_tables/blocks/crystal_door.json | 29 --- .../loot_tables/blocks/curing_joke.json | 20 --- .../blocks/dark_oak_stable_door.json | 29 --- .../loot_tables/blocks/dense_cloud.json | 27 --- .../blocks/dense_cloud_stairs.json | 27 --- .../loot_tables/blocks/etched_cloud.json | 27 --- .../blocks/etched_cloud_stairs.json | 27 --- .../blocks/flowering_zap_leaves.json | 135 -------------- .../loot_tables/blocks/frosted_obsidian.json | 20 --- .../loot_tables/blocks/golden_oak_leaves.json | 116 ------------ .../loot_tables/blocks/golden_oak_log.json | 20 --- .../blocks/golden_oak_sapling.json | 20 --- .../loot_tables/blocks/green_apple.json | 20 --- .../blocks/green_apple_leaves.json | 116 ------------ .../blocks/green_apple_sapling.json | 20 --- .../unicopia/loot_tables/blocks/hive.json | 20 --- .../unicopia/loot_tables/blocks/mango.json | 20 --- .../loot_tables/blocks/mango_leaves.json | 135 -------------- .../loot_tables/blocks/palm_button.json | 20 --- .../loot_tables/blocks/palm_door.json | 29 --- .../loot_tables/blocks/palm_fence.json | 20 --- .../loot_tables/blocks/palm_fence_gate.json | 20 --- .../loot_tables/blocks/palm_hanging_sign.json | 20 --- .../loot_tables/blocks/palm_leaves.json | 135 -------------- .../unicopia/loot_tables/blocks/palm_log.json | 20 --- .../loot_tables/blocks/palm_planks.json | 20 --- .../blocks/palm_pressure_plate.json | 20 --- .../loot_tables/blocks/palm_sapling.json | 20 --- .../loot_tables/blocks/palm_sign.json | 20 --- .../loot_tables/blocks/palm_slab.json | 20 --- .../loot_tables/blocks/palm_stairs.json | 20 --- .../loot_tables/blocks/palm_trapdoor.json | 20 --- .../loot_tables/blocks/palm_wood.json | 20 --- .../blocks/potted_golden_oak_sapling.json | 36 ---- .../blocks/potted_green_apple_sapling.json | 36 ---- .../blocks/potted_mango_sapling.json | 36 ---- .../blocks/potted_palm_sapling.json | 36 ---- .../blocks/potted_sour_apple_sapling.json | 36 ---- .../blocks/potted_sweet_apple_sapling.json | 36 ---- .../loot_tables/blocks/potted_zapling.json | 36 ---- .../loot_tables/blocks/soggy_cloud.json | 20 --- .../blocks/soggy_cloud_stairs.json | 27 --- .../loot_tables/blocks/sour_apple.json | 20 --- .../loot_tables/blocks/sour_apple_leaves.json | 116 ------------ .../blocks/sour_apple_sapling.json | 20 --- .../loot_tables/blocks/stable_door.json | 29 --- .../loot_tables/blocks/stripped_palm_log.json | 20 --- .../blocks/stripped_palm_wood.json | 20 --- .../loot_tables/blocks/stripped_zap_log.json | 20 --- .../loot_tables/blocks/stripped_zap_wood.json | 20 --- .../loot_tables/blocks/surface_chitin.json | 27 --- .../loot_tables/blocks/sweet_apple.json | 20 --- .../blocks/sweet_apple_leaves.json | 116 ------------ .../blocks/sweet_apple_sapling.json | 20 --- .../loot_tables/blocks/unstable_cloud.json | 20 --- .../blocks/waxed_stripped_zap_log.json | 20 --- .../blocks/waxed_stripped_zap_wood.json | 20 --- .../loot_tables/blocks/waxed_zap_fence.json | 20 --- .../blocks/waxed_zap_fence_gate.json | 20 --- .../loot_tables/blocks/waxed_zap_log.json | 20 --- .../loot_tables/blocks/waxed_zap_planks.json | 20 --- .../loot_tables/blocks/waxed_zap_slab.json | 20 --- .../loot_tables/blocks/waxed_zap_stairs.json | 20 --- .../loot_tables/blocks/waxed_zap_wood.json | 20 --- .../loot_tables/blocks/weather_vane.json | 20 --- .../loot_tables/blocks/zap_apple.json | 20 --- .../unicopia/loot_tables/blocks/zap_bulb.json | 20 --- .../loot_tables/blocks/zap_fence.json | 20 --- .../loot_tables/blocks/zap_fence_gate.json | 20 --- .../loot_tables/blocks/zap_leaves.json | 135 -------------- .../unicopia/loot_tables/blocks/zap_log.json | 20 --- .../loot_tables/blocks/zap_planks.json | 20 --- .../unicopia/loot_tables/blocks/zap_slab.json | 20 --- .../loot_tables/blocks/zap_stairs.json | 20 --- .../unicopia/loot_tables/blocks/zap_wood.json | 20 --- .../unicopia/loot_tables/blocks/zapling.json | 20 --- .../unicopia/tags/blocks/catapult_immune.json | 7 - .../data/unicopia/tags/blocks/cloud_beds.json | 6 - .../unicopia/tags/blocks/cloud_slabs.json | 11 -- .../unicopia/tags/blocks/cloud_stairs.json | 11 -- .../data/unicopia/tags/blocks/clouds.json | 15 -- .../tags/blocks/mineable/polearm.json | 7 - .../data/unicopia/tags/items/horse_shoes.json | 9 - .../data/unicopia/tags/items/polearms.json | 11 -- 157 files changed, 394 insertions(+), 3533 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java delete mode 100644 src/main/resources/data/minecraft/tags/blocks/crops.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/dragon_immune.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/fire.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/leaves.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/logs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/maintains_farmland.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/axe.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/piglin_loved.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/planks.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/saplings.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/standing_signs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wall_signs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_doors.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_fence_gates.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_fences.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json delete mode 100644 src/main/resources/data/minecraft/tags/items/beds.json delete mode 100644 src/main/resources/data/minecraft/tags/items/bookshelf_books.json delete mode 100644 src/main/resources/data/minecraft/tags/items/chest_boats.json delete mode 100644 src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/fence_gates.json delete mode 100644 src/main/resources/data/minecraft/tags/items/hanging_signs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/leaves.json delete mode 100644 src/main/resources/data/minecraft/tags/items/logs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/logs_that_burn.json delete mode 100644 src/main/resources/data/minecraft/tags/items/music_discs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/piglin_loved.json delete mode 100644 src/main/resources/data/minecraft/tags/items/planks.json delete mode 100644 src/main/resources/data/minecraft/tags/items/saplings.json delete mode 100644 src/main/resources/data/minecraft/tags/items/signs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/slabs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/stairs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/tools.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_buttons.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_doors.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_fences.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_slabs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_stairs.json delete mode 100644 src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/carved_cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/chitin.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/chitin_spikes.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloth_bed.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_bed.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_bricks.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_door.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_pillar.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_planks.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/crystal_door.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/curing_joke.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/dark_oak_stable_door.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/frosted_obsidian.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/green_apple.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/green_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/hive.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/mango.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/mango_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_button.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_door.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_fence.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_hanging_sign.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_planks.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_pressure_plate.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_sign.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_trapdoor.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/palm_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_golden_oak_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_green_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_mango_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_palm_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_sour_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_sweet_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/potted_zapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sour_apple.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/stable_door.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/surface_chitin.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/unstable_cloud.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_planks.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/weather_vane.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_apple.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_bulb.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_fence.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_log.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_planks.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_slab.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_stairs.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zap_wood.json delete mode 100644 src/main/resources/data/unicopia/loot_tables/blocks/zapling.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/catapult_immune.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/cloud_beds.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/cloud_slabs.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/clouds.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/mineable/polearm.json delete mode 100644 src/main/resources/data/unicopia/tags/items/horse_shoes.json delete mode 100644 src/main/resources/data/unicopia/tags/items/polearms.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java index 50ed2e3f..68e013d8 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -1,17 +1,40 @@ package com.minelittlepony.unicopia.datagen; +import com.minelittlepony.unicopia.datagen.providers.UBlockLootTableProvider; +import com.minelittlepony.unicopia.datagen.providers.UBlockTagProvider; +import com.minelittlepony.unicopia.datagen.providers.UItemTagProvider; import com.minelittlepony.unicopia.datagen.providers.UModelProvider; import com.minelittlepony.unicopia.datagen.providers.URecipeProvider; +import com.minelittlepony.unicopia.server.world.UWorldGen; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.minecraft.registry.RegistryBuilder; +import net.minecraft.registry.RegistryEntryLookup; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.world.biome.OverworldBiomeCreator; +import net.minecraft.world.gen.carver.ConfiguredCarver; +import net.minecraft.world.gen.feature.PlacedFeature; public class Datagen implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { final FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); + UBlockTagProvider blockTags = pack.addProvider(UBlockTagProvider::new); + pack.addProvider((output, registries) -> new UItemTagProvider(output, registries, blockTags)); + pack.addProvider(UModelProvider::new); pack.addProvider(URecipeProvider::new); + pack.addProvider(UBlockLootTableProvider::new); + } + + @Override + public void buildRegistry(RegistryBuilder builder) { + builder.addRegistry(RegistryKeys.BIOME, registerable -> { + RegistryEntryLookup placedFeatureLookup = registerable.getRegistryLookup(RegistryKeys.PLACED_FEATURE); + RegistryEntryLookup> carverLookup = registerable.getRegistryLookup(RegistryKeys.CONFIGURED_CARVER); + registerable.register(UWorldGen.SWEET_APPLE_ORCHARD, OverworldBiomeCreator.createNormalForest(placedFeatureLookup, carverLookup, false, false, false)); + }); } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java new file mode 100644 index 00000000..d099100a --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java @@ -0,0 +1,131 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.List; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.server.world.Tree; +import com.minelittlepony.unicopia.server.world.UTreeGen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.minecraft.block.BedBlock; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.enums.BedPart; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.Items; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.condition.TableBonusLootCondition; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.ConstantLootNumberProvider; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; + +public class UBlockLootTableProvider extends FabricBlockLootTableProvider { + + public UBlockLootTableProvider(FabricDataOutput output) { + super(output); + } + + @Override + public void generate() { + + // simple drops + List.of( + UBlocks.CARVED_CLOUD, UBlocks.UNSTABLE_CLOUD, + UBlocks.CHISELLED_CHITIN_STAIRS, UBlocks.CHISELLED_CHITIN, + UBlocks.CLOUD_BRICK_STAIRS, UBlocks.CLOUD_BRICKS, + UBlocks.CLOUD_PLANK_STAIRS, UBlocks.CLOUD_PLANKS, + UBlocks.CURING_JOKE, + UBlocks.GOLDEN_OAK_LOG, + UBlocks.HIVE, + + UBlocks.PALM_BUTTON, UBlocks.PALM_FENCE_GATE, UBlocks.PALM_FENCE, UBlocks.PALM_LOG, UBlocks.PALM_PLANKS, + UBlocks.PALM_PRESSURE_PLATE, UBlocks.PALM_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_STAIRS, UBlocks.PALM_TRAPDOOR, UBlocks.PALM_WOOD, + + UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD, + UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD, + + UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD, + UBlocks.WAXED_ZAP_FENCE_GATE, UBlocks.WAXED_ZAP_FENCE, + UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_PLANKS, UBlocks.WAXED_ZAP_STAIRS, UBlocks.WAXED_ZAP_WOOD, + + UBlocks.WEATHER_VANE, + + UBlocks.ZAP_FENCE_GATE, UBlocks.ZAP_FENCE, + UBlocks.ZAP_LOG, UBlocks.ZAP_PLANKS, UBlocks.ZAP_STAIRS, UBlocks.ZAP_WOOD + ).forEach(this::addDrop); + + // slabs + List.of( + UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CLOUD_BRICK_SLAB, + UBlocks.CLOUD_PLANK_SLAB, UBlocks.PALM_SLAB, UBlocks.ZAP_SLAB, UBlocks.WAXED_ZAP_SLAB + ).forEach(slab -> addDrop(slab, this::slabDrops)); + + // fruit + UModelProvider.FRUITS.forEach((block, drop) -> { + if (block != UBlocks.GOLDEN_APPLE) { + addDrop(block, drop); + } + }); + List.of(UBlocks.GREEN_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES, UBlocks.GOLDEN_OAK_LEAVES).forEach(block -> addDrop(block, this::fruitLeavesDrops)); + addDrop(UBlocks.MANGO_LEAVES, block -> leavesDrops(block, UTreeGen.MANGO_TREE.sapling().get(), 0.025F, 0.027777778F, 0.03125F, 0.041666668F, 0.1F)); // same chance as jungle + addDrop(UBlocks.ZAP_LEAVES, block -> leavesDrops(block, UTreeGen.ZAP_APPLE_TREE.sapling().get(), SAPLING_DROP_CHANCE)); + addDrop(UBlocks.FLOWERING_ZAP_LEAVES, block -> leavesDrops(block, UTreeGen.ZAP_APPLE_TREE.sapling().get(), SAPLING_DROP_CHANCE)); + addDrop(UBlocks.PALM_LEAVES, block -> leavesDrops(block, UTreeGen.BANANA_TREE.sapling().get(), SAPLING_DROP_CHANCE)); + + Tree.REGISTRY.forEach(tree -> { + tree.sapling().ifPresent(this::addDrop); + tree.pot().ifPresent(this::addPottedPlantDrops); + }); + + // doors + List.of( + UBlocks.CLOUD_DOOR, UBlocks.CRYSTAL_DOOR, + UBlocks.DARK_OAK_DOOR, UBlocks.PALM_DOOR, UBlocks.STABLE_DOOR + ).forEach(door -> addDrop(door, this::doorDrops)); + + //beds + List.of( + UBlocks.CLOUD_BED, UBlocks.CLOTH_BED + ).forEach(bed -> addDrop(bed, b -> dropsWithProperty(b, BedBlock.PART, BedPart.HEAD))); + + addDrop(UBlocks.CHITIN_SPIKES, drops(UBlocks.CHITIN_SPIKES, UItems.CARAPACE, ConstantLootNumberProvider.create(6))); + addDrop(UBlocks.CHITIN, drops(UBlocks.CHITIN, UItems.CARAPACE, ConstantLootNumberProvider.create(9))); + addDrop(UBlocks.SURFACE_CHITIN, drops(UBlocks.SURFACE_CHITIN, UItems.CARAPACE, ConstantLootNumberProvider.create(9))); + + addDrop(UBlocks.CLOUD, drops(UBlocks.CLOUD, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(4))); + addDrop(UBlocks.CLOUD_STAIRS, drops(UBlocks.CLOUD_STAIRS, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(6))); + + addDrop(UBlocks.SOGGY_CLOUD, drops(UBlocks.CLOUD, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(4))); + addDrop(UBlocks.SOGGY_CLOUD_STAIRS, drops(UBlocks.CLOUD_STAIRS, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(6))); + + addDrop(UBlocks.DENSE_CLOUD, drops(UBlocks.DENSE_CLOUD, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(9))); + addDrop(UBlocks.DENSE_CLOUD_STAIRS, drops(UBlocks.DENSE_CLOUD_STAIRS, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(13))); + addDrop(UBlocks.ETCHED_CLOUD, drops(UBlocks.ETCHED_CLOUD, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(9))); + addDrop(UBlocks.ETCHED_CLOUD_STAIRS, drops(UBlocks.ETCHED_CLOUD_STAIRS, UItems.CLOUD_LUMP, ConstantLootNumberProvider.create(13))); + + addDrop(UBlocks.CLOUD_PILLAR, drops(UBlocks.CLOUD_PILLAR, UBlocks.CLOUD, ConstantLootNumberProvider.create(6))); + + addDrop(UBlocks.FROSTED_OBSIDIAN, Blocks.OBSIDIAN); + } + + public LootTable.Builder fruitLeavesDrops(Block leaves) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .with(ItemEntry.builder(leaves).conditionally(WITH_SILK_TOUCH_OR_SHEARS)) + ) + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH_NOR_SHEARS) + .with( + applyExplosionDecay(leaves, ItemEntry.builder(Items.STICK) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2))) + ) + .conditionally(TableBonusLootCondition.builder(Enchantments.FORTUNE, LEAVES_STICK_DROP_CHANCE)) + ) + ); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index 2d89a5e7..e31252fb 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -181,14 +181,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerParentedItemModel(UBlocks.MANGO_LEAVES, ModelIds.getBlockModelId(Blocks.JUNGLE_LEAVES)); // fruit - Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, - UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, - UBlocks.MANGO, UItems.MANGO, - UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, - UBlocks.SWEET_APPLE, UItems.SWEET_APPLE, - UBlocks.ZAP_APPLE, UItems.ZAP_APPLE, - UBlocks.ZAP_BULB, UItems.ZAP_BULB - ).forEach((block, item) -> registerSingleton(block, TextureMap.cross(ModelIds.getItemModelId(item)), BlockModels.FRUIT)); + UModelProvider.FRUITS.forEach((block, item) -> registerSingleton(block, TextureMap.cross(ModelIds.getItemModelId(item)), BlockModels.FRUIT)); // bales registerAll((g, block) -> g.registerBale(Unicopia.id(block.getLeft().getPath().replace("bale", "block")), block.getLeft(), block.getRight()), diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java new file mode 100644 index 00000000..64fa1437 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java @@ -0,0 +1,167 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.concurrent.CompletableFuture; + +import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.Unicopia; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.server.world.Tree; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryWrapper.WrapperLookup; +import net.minecraft.registry.tag.BlockTags; + +public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { + public UBlockTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected void configure(WrapperLookup registries) { + Block[] crops = { + UBlocks.OATS, UBlocks.OATS_STEM, UBlocks.OATS_CROWN, + UBlocks.ROCKS, UBlocks.PINEAPPLE, + UBlocks.SWEET_APPLE_SPROUT, UBlocks.GREEN_APPLE_SPROUT, UBlocks.SWEET_APPLE_SPROUT, + UBlocks.GOLDEN_OAK_SPROUT + }; + + getOrCreateTagBuilder(UTags.CATAPULT_IMMUNE).add(Blocks.BEDROCK).forceAddTag(BlockTags.DOORS).forceAddTag(BlockTags.TRAPDOORS); + getOrCreateTagBuilder(BlockTags.CROPS).add(crops); + getOrCreateTagBuilder(BlockTags.BEE_GROWABLES).add(crops); + getOrCreateTagBuilder(BlockTags.MAINTAINS_FARMLAND).add(crops); + getOrCreateTagBuilder(BlockTags.NEEDS_DIAMOND_TOOL).add(UBlocks.FROSTED_OBSIDIAN); + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add(UBlocks.ROCKS, UBlocks.FROSTED_OBSIDIAN, UBlocks.WEATHER_VANE); + getOrCreateTagBuilder(BlockTags.DRAGON_IMMUNE).add(UBlocks.FROSTED_OBSIDIAN, UBlocks.GOLDEN_OAK_LOG, UBlocks.GOLDEN_OAK_LEAVES); + getOrCreateTagBuilder(BlockTags.FIRE).add(UBlocks.SPECTRAL_FIRE); + getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.HAY_BLOCK).addOptional(Unicopia.id("rice_block")).addOptional(Unicopia.id("straw_block")); + + addZapWoodset(); + addPalmWoodset(); + addCloudBlocksets(); + addChitinBlocksets(); + addHayBlocks(); + addFruitTrees(); + } + + private void addFruitTrees() { + Block[] leaves = { + UBlocks.GREEN_APPLE_LEAVES, UBlocks.SWEET_APPLE_LEAVES, UBlocks.SOUR_APPLE_LEAVES, + UBlocks.GOLDEN_OAK_LEAVES, UBlocks.MANGO_LEAVES + }; + + getOrCreateTagBuilder(BlockTags.LEAVES).add(leaves); + getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(leaves); + + Block[] burnableLogs = { UBlocks.GOLDEN_OAK_LOG }; + getOrCreateTagBuilder(BlockTags.LOGS).add(burnableLogs); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(burnableLogs); + + var saplings = Tree.REGISTRY.stream().flatMap(tree -> tree.sapling().stream()).toArray(Block[]::new); + + getOrCreateTagBuilder(BlockTags.SAPLINGS).add(saplings); + getOrCreateTagBuilder(BlockTags.MAINTAINS_FARMLAND).add(saplings); + getOrCreateTagBuilder(BlockTags.GUARDED_BY_PIGLINS).add(UBlocks.GOLDEN_OAK_LEAVES, UBlocks.GOLDEN_OAK_LOG, UBlocks.GOLDEN_OAK_SPROUT, UBlocks.GOLDEN_APPLE); + } + + private void addZapWoodset() { + getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.ZAP_LEAVES, UBlocks.FLOWERING_ZAP_LEAVES); + getOrCreateTagBuilder(UTags.POLEARM_MINEABLE).add( + UBlocks.ZAP_LEAVES, UBlocks.FLOWERING_ZAP_LEAVES, + UBlocks.ZAP_PLANKS, + UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD, + UBlocks.ZAP_FENCE_GATE, UBlocks.ZAP_FENCE, + UBlocks.ZAP_SLAB, + UBlocks.ZAP_STAIRS + ); + + Block[] burnableLogs = { UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD }; + getOrCreateTagBuilder(BlockTags.LOGS).add(burnableLogs).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(burnableLogs); + getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.ZAP_PLANKS, UBlocks.WAXED_ZAP_PLANKS); + + //getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.ZAP_BUTTON); + //getOrCreateTagBuilder(BlockTags.WOODEN_DOORS).add(UBlocks.ZAP_DOOR); + getOrCreateTagBuilder(BlockTags.FENCE_GATES).add(UBlocks.ZAP_FENCE_GATE, UBlocks.WAXED_ZAP_FENCE_GATE); + getOrCreateTagBuilder(BlockTags.WOODEN_FENCES).add(UBlocks.ZAP_FENCE, UBlocks.WAXED_ZAP_FENCE); + //getOrCreateTagBuilder(BlockTags.PRESSURE_PLATES).add(UBlocks.ZAP_PRESSURE_PLATE); + //getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES).add(UBlocks.ZAP_PRESSURE_PLATE); + getOrCreateTagBuilder(BlockTags.SLABS).add(UBlocks.ZAP_SLAB, UBlocks.WAXED_ZAP_SLAB); + getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).add(UBlocks.ZAP_SLAB, UBlocks.WAXED_ZAP_SLAB); + getOrCreateTagBuilder(BlockTags.STAIRS).add(UBlocks.ZAP_STAIRS, UBlocks.WAXED_ZAP_STAIRS); + getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).add(UBlocks.ZAP_STAIRS, UBlocks.WAXED_ZAP_STAIRS); + //getOrCreateTagBuilder(BlockTags.TRAPDOORS).add(UBlocks.ZAP_TRAPDOOR); + //getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS).add(UBlocks.ZAP_TRAPDOOR); + } + + private void addPalmWoodset() { + getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.PALM_LEAVES); + getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.PALM_LEAVES); + + Block[] logs = { UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD }; + getOrCreateTagBuilder(BlockTags.LOGS).add(logs); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(logs); + getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.PALM_PLANKS); + addSign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); + getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.PALM_BUTTON); + getOrCreateTagBuilder(BlockTags.WOODEN_DOORS).add(UBlocks.PALM_DOOR); + getOrCreateTagBuilder(BlockTags.FENCE_GATES).add(UBlocks.PALM_FENCE_GATE); + getOrCreateTagBuilder(BlockTags.WOODEN_FENCES).add(UBlocks.PALM_FENCE); + getOrCreateTagBuilder(BlockTags.PRESSURE_PLATES).add(UBlocks.PALM_PRESSURE_PLATE); + getOrCreateTagBuilder(BlockTags.WOODEN_PRESSURE_PLATES).add(UBlocks.PALM_PRESSURE_PLATE); + getOrCreateTagBuilder(BlockTags.SLABS).add(UBlocks.PALM_SLAB); + getOrCreateTagBuilder(BlockTags.WOODEN_SLABS).add(UBlocks.PALM_SLAB); + getOrCreateTagBuilder(BlockTags.STAIRS).add(UBlocks.PALM_STAIRS); + getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS).add(UBlocks.PALM_STAIRS); + getOrCreateTagBuilder(BlockTags.TRAPDOORS).add(UBlocks.PALM_TRAPDOOR); + getOrCreateTagBuilder(BlockTags.WOODEN_TRAPDOORS).add(UBlocks.PALM_TRAPDOOR); + } + + private void addCloudBlocksets() { + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add( + UBlocks.CLOUD_BRICKS, UBlocks.CLOUD_BRICK_SLAB, UBlocks.CLOUD_BRICK_STAIRS, UBlocks.COMPACTED_CLOUD_BRICKS, UBlocks.CARVED_CLOUD + ); + getOrCreateTagBuilder(BlockTags.AXE_MINEABLE).add( + UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_PLANK_STAIRS, UBlocks.COMPACTED_CLOUD_PLANKS + ); + + getOrCreateTagBuilder(UTags.block("cloud_beds")).add(UBlocks.CLOUD_BED); + getOrCreateTagBuilder(UTags.block("cloud_slabs")).add( + UBlocks.CLOUD_SLAB, UBlocks.SOGGY_CLOUD_SLAB, UBlocks.DENSE_CLOUD_SLAB, UBlocks.ETCHED_CLOUD_SLAB, + UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_BRICK_SLAB + ); + getOrCreateTagBuilder(UTags.block("cloud_stairs")).add( + UBlocks.CLOUD_STAIRS, UBlocks.SOGGY_CLOUD_STAIRS, UBlocks.DENSE_CLOUD_STAIRS, UBlocks.ETCHED_CLOUD_STAIRS, + UBlocks.CLOUD_PLANK_STAIRS, UBlocks.CLOUD_BRICK_STAIRS + ); + getOrCreateTagBuilder(UTags.block("clouds")).add( + UBlocks.CLOUD, UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_BRICKS, UBlocks.DENSE_CLOUD, + UBlocks.ETCHED_CLOUD, UBlocks.CARVED_CLOUD, + UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_CLOUD_BRICKS, + UBlocks.UNSTABLE_CLOUD, UBlocks.SOGGY_CLOUD + ); + } + + private void addChitinBlocksets() { + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add( + UBlocks.CHITIN_SPIKES, + UBlocks.CHISELLED_CHITIN, UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CHISELLED_CHITIN_STAIRS + ); + getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE).add(UBlocks.CHITIN, UBlocks.SURFACE_CHITIN); + } + + private void addSign(Block standing, Block wall, Block hanging, Block wallHanging) { + getOrCreateTagBuilder(BlockTags.STANDING_SIGNS).add(standing); + getOrCreateTagBuilder(BlockTags.WALL_SIGNS).add(wall); + + getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS).add(hanging); + getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS).add(wallHanging); + } + + private void addHayBlocks() { + + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java new file mode 100644 index 00000000..22104b6a --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java @@ -0,0 +1,59 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.concurrent.CompletableFuture; + +import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.item.UItems; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryWrapper.WrapperLookup; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; + +public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { + public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, BlockTagProvider blockTagProvider) { + super(output, registriesFuture, blockTagProvider); + } + + @Override + protected void configure(WrapperLookup arg) { + copyBlockTags(); + getOrCreateTagBuilder(ItemTags.BOOKSHELF_BOOKS).add(UItems.SPELLBOOK); + getOrCreateTagBuilder(ItemTags.BEDS).add(UItems.CLOTH_BED, UItems.CLOUD_BED); + + getOrCreateTagBuilder(ItemTags.CHEST_BOATS).add(UItems.PALM_CHEST_BOAT); + getOrCreateTagBuilder(ItemTags.BOATS).add(UItems.PALM_BOAT); + getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR); + getOrCreateTagBuilder(ItemTags.CREEPER_DROP_MUSIC_DISCS).add(UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR); + + getOrCreateTagBuilder(ItemTags.SIGNS).add(UBlocks.PALM_SIGN.asItem()); + getOrCreateTagBuilder(ItemTags.HANGING_SIGNS).add(UBlocks.PALM_HANGING_SIGN.asItem()); + + getOrCreateTagBuilder(UTags.HORSE_SHOES).add(UItems.IRON_HORSE_SHOE, UItems.GOLDEN_HORSE_SHOE, UItems.COPPER_HORSE_SHOE, UItems.NETHERITE_HORSE_SHOE); + getOrCreateTagBuilder(UTags.POLEARMS).add(UItems.WOODEN_POLEARM, UItems.STONE_POLEARM, UItems.IRON_POLEARM, UItems.GOLDEN_POLEARM, UItems.DIAMOND_POLEARM, UItems.NETHERITE_POLEARM); + + getOrCreateTagBuilder(ItemTags.TOOLS).addTag(UTags.HORSE_SHOES).addTag(UTags.POLEARMS); + } + + private void copyBlockTags() { + copy(BlockTags.LEAVES, ItemTags.LEAVES); + copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); + copy(BlockTags.LOGS, ItemTags.LOGS); + copy(BlockTags.PLANKS, ItemTags.PLANKS); + copy(BlockTags.WOODEN_BUTTONS, ItemTags.WOODEN_BUTTONS); + copy(BlockTags.WOODEN_DOORS, ItemTags.WOODEN_DOORS); + copy(BlockTags.FENCE_GATES, ItemTags.FENCE_GATES); + copy(BlockTags.WOODEN_FENCES, ItemTags.WOODEN_FENCES); + copy(BlockTags.WOODEN_PRESSURE_PLATES, ItemTags.WOODEN_PRESSURE_PLATES); + copy(BlockTags.SLABS, ItemTags.SLABS); + copy(BlockTags.WOODEN_SLABS, ItemTags.WOODEN_SLABS); + copy(BlockTags.STAIRS, ItemTags.STAIRS); + copy(BlockTags.WOODEN_STAIRS, ItemTags.WOODEN_STAIRS); + copy(BlockTags.TRAPDOORS, ItemTags.TRAPDOORS); + copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); + copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 394a45ba..f0993a97 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -1,14 +1,18 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.List; +import java.util.Map; + import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import net.minecraft.block.Block; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.item.Item; +import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.client.ModelIds; @@ -16,6 +20,15 @@ import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; public class UModelProvider extends FabricModelProvider { + static final Map FRUITS = Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, + UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, + UBlocks.MANGO, UItems.MANGO, + UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, + UBlocks.SWEET_APPLE, UItems.SWEET_APPLE, + UBlocks.ZAP_APPLE, UItems.ZAP_APPLE, + UBlocks.ZAP_BULB, UItems.ZAP_BULB + ); + public UModelProvider(FabricDataOutput output) { super(output); } diff --git a/src/main/resources/data/minecraft/tags/blocks/crops.json b/src/main/resources/data/minecraft/tags/blocks/crops.json deleted file mode 100644 index 8e14052f..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/crops.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:rocks", - "unicopia:pineapple" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json b/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json deleted file mode 100644 index 955d6bc1..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:frosted_obsidian", - "unicopia:golden_oak_leaves", - "unicopia:golden_oak_log" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/fire.json b/src/main/resources/data/minecraft/tags/blocks/fire.json deleted file mode 100644 index 9abc7a3b..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/fire.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:spectral_fire" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/leaves.json b/src/main/resources/data/minecraft/tags/blocks/leaves.json deleted file mode 100644 index ced25022..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/leaves.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_leaves", - "unicopia:zap_leaves", - "unicopia:flowering_zap_leaves", - "unicopia:green_apple_leaves", - "unicopia:sweet_apple_leaves", - "unicopia:sour_apple_leaves", - "unicopia:golden_oak_leaves", - "unicopia:mango_leaves" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/main/resources/data/minecraft/tags/blocks/logs.json deleted file mode 100644 index 1748acb9..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/logs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:golden_oak_log", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood", - "unicopia:zap_log", - "unicopia:zap_wood", - "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood", - "unicopia:waxed_zap_log", - "unicopia:waxed_zap_wood", - "unicopia:waxed_stripped_zap_log", - "unicopia:waxed_stripped_zap_wood" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json deleted file mode 100644 index 61695d92..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:golden_oak_log", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood", - "unicopia:waxed_zap_log", - "unicopia:waxed_zap_wood", - "unicopia:waxed_stripped_zap_log", - "unicopia:waxed_stripped_zap_wood" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/maintains_farmland.json b/src/main/resources/data/minecraft/tags/blocks/maintains_farmland.json deleted file mode 100644 index 2d5d0b68..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/maintains_farmland.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:rocks", - "unicopia:pineapple", - "unicopia:oats", - "unicopia:oats_stem", - "unicopia:green_apple_sprout", - "unicopia:sweet_apple_sprout", - "unicopia:sour_apple_sprout", - "unicopia:golden_oak_sprout", - "unicopia:gold_root" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index f823947f..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_planks", - "unicopia:cloud_plank_slab", - "unicopia:cloud_plank_stairs", - "unicopia:compacted_cloud_planks", - "unicopia:waxed_zap_planks" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json deleted file mode 100644 index c6d84218..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_leaves", - "unicopia:zap_leaves", - "unicopia:flowering_zap_leaves", - "unicopia:green_apple_leaves", - "unicopia:sweet_apple_leaves", - "unicopia:sour_apple_leaves", - "unicopia:golden_oak_leaves", - "unicopia:mango_leaves", - "unicopia:hay_block", - { "id": "unicopia:rice_block", "required": false }, - { "id": "unicopia:straw_block", "required": false } - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index 46d67b80..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:rocks", - "unicopia:frosted_obsidian", - "unicopia:weather_vane", - "unicopia:chitin_spikes", - "unicopia:chiselled_chitin", - "unicopia:chiselled_chitin_slab", - "unicopia:chiselled_chitin_stairs", - "unicopia:chiselled_chitin_hull", - "unicopia:cloud_bricks", - "unicopia:cloud_brick_slab", - "unicopia:cloud_brick_stairs", - "unicopia:compacted_cloud_bricks", - "unicopia:carved_cloud" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json deleted file mode 100644 index 07ee6166..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:chitin", - "unicopia:surface_chitin" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json deleted file mode 100644 index 2daf1e1f..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:frosted_obsidian" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/piglin_loved.json b/src/main/resources/data/minecraft/tags/blocks/piglin_loved.json deleted file mode 100644 index 22641dfc..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/piglin_loved.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:golden_oak_leaves", - "unicopia:golden_oak_log", - "unicopia:golden_oak_sapling" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/main/resources/data/minecraft/tags/blocks/planks.json deleted file mode 100644 index cc11bde7..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_planks", - "unicopia:zap_planks" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/saplings.json b/src/main/resources/data/minecraft/tags/blocks/saplings.json deleted file mode 100644 index c504b996..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/saplings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango_sapling" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/standing_signs.json b/src/main/resources/data/minecraft/tags/blocks/standing_signs.json deleted file mode 100644 index cad58ba6..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/standing_signs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_sign" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wall_signs.json b/src/main/resources/data/minecraft/tags/blocks/wall_signs.json deleted file mode 100644 index 24175517..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wall_signs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_wall_sign" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json deleted file mode 100644 index 276ebb11..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_button" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json deleted file mode 100644 index e7071e6f..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_door" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fence_gates.json b/src/main/resources/data/minecraft/tags/blocks/wooden_fence_gates.json deleted file mode 100644 index 234e65f0..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_fence_gates.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_fence_gate", - "unicopia:zap_fence_gate", - "unicopia:waxed_zap_fence_gate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json deleted file mode 100644 index e5c89b87..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_fence", - "unicopia:zap_fence", - "unicopia:waxed_zap_fence" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json deleted file mode 100644 index 9b22cfff..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_pressure_plate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json deleted file mode 100644 index f464e8b0..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_slab", - "unicopia:zap_slab", - "unicopia:waxed_zap_slab" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json deleted file mode 100644 index 5549f9cb..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_stairs", - "unicopia:zap_stairs", - "unicopia:waxed_zap_stairs" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json deleted file mode 100644 index cddd514f..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_trapdoor" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/beds.json b/src/main/resources/data/minecraft/tags/items/beds.json deleted file mode 100644 index 0ec4b6cd..00000000 --- a/src/main/resources/data/minecraft/tags/items/beds.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#unicopia:cloud_beds", - "unicopia:cloth_bed" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/bookshelf_books.json b/src/main/resources/data/minecraft/tags/items/bookshelf_books.json deleted file mode 100644 index 8da8fb6c..00000000 --- a/src/main/resources/data/minecraft/tags/items/bookshelf_books.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:spellbook" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/chest_boats.json b/src/main/resources/data/minecraft/tags/items/chest_boats.json deleted file mode 100644 index 4ffee04d..00000000 --- a/src/main/resources/data/minecraft/tags/items/chest_boats.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_chest_boat" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json b/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json deleted file mode 100644 index ee97b7c2..00000000 --- a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:music_disc_crusade", - "unicopia:music_disc_pet", - "unicopia:music_disc_popular", - "unicopia:music_disc_funk" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/fence_gates.json b/src/main/resources/data/minecraft/tags/items/fence_gates.json deleted file mode 100644 index 234e65f0..00000000 --- a/src/main/resources/data/minecraft/tags/items/fence_gates.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_fence_gate", - "unicopia:zap_fence_gate", - "unicopia:waxed_zap_fence_gate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/hanging_signs.json b/src/main/resources/data/minecraft/tags/items/hanging_signs.json deleted file mode 100644 index 2d324a64..00000000 --- a/src/main/resources/data/minecraft/tags/items/hanging_signs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_hanging_sign" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/leaves.json b/src/main/resources/data/minecraft/tags/items/leaves.json deleted file mode 100644 index 852058e8..00000000 --- a/src/main/resources/data/minecraft/tags/items/leaves.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_leaves", - "unicopia:zap_leaves", - "unicopia:green_apple_leaves", - "unicopia:sweet_apple_leaves", - "unicopia:sour_apple_leaves", - "unicopia:mango_leaves" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/main/resources/data/minecraft/tags/items/logs.json deleted file mode 100644 index dbc9931d..00000000 --- a/src/main/resources/data/minecraft/tags/items/logs.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood", - "unicopia:zap_log", - "unicopia:zap_wood", - "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood", - "unicopia:waxed_zap_log", - "unicopia:waxed_zap_wood", - "unicopia:waxed_stripped_zap_log", - "unicopia:waxed_stripped_zap_wood" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json b/src/main/resources/data/minecraft/tags/items/logs_that_burn.json deleted file mode 100644 index dbc9931d..00000000 --- a/src/main/resources/data/minecraft/tags/items/logs_that_burn.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood", - "unicopia:zap_log", - "unicopia:zap_wood", - "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood", - "unicopia:waxed_zap_log", - "unicopia:waxed_zap_wood", - "unicopia:waxed_stripped_zap_log", - "unicopia:waxed_stripped_zap_wood" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/music_discs.json b/src/main/resources/data/minecraft/tags/items/music_discs.json deleted file mode 100644 index ee97b7c2..00000000 --- a/src/main/resources/data/minecraft/tags/items/music_discs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:music_disc_crusade", - "unicopia:music_disc_pet", - "unicopia:music_disc_popular", - "unicopia:music_disc_funk" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/piglin_loved.json b/src/main/resources/data/minecraft/tags/items/piglin_loved.json deleted file mode 100644 index e34a469d..00000000 --- a/src/main/resources/data/minecraft/tags/items/piglin_loved.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:golden_oak_seeds", - "unicopia:golden_oak_leaves", - "unicopia:golden_oak_log", - "unicopia:golden_oak_sapling" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/planks.json b/src/main/resources/data/minecraft/tags/items/planks.json deleted file mode 100644 index cc11bde7..00000000 --- a/src/main/resources/data/minecraft/tags/items/planks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_planks", - "unicopia:zap_planks" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/saplings.json b/src/main/resources/data/minecraft/tags/items/saplings.json deleted file mode 100644 index 1be3e7f1..00000000 --- a/src/main/resources/data/minecraft/tags/items/saplings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango_sapling", - "unicopia:palm_sapling", - "unicopia:green_apple_sapling", - "unicopia:sour_apple_sapling", - "unicopia:sweet_apple_sapling", - "unicopia:zapling" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/signs.json b/src/main/resources/data/minecraft/tags/items/signs.json deleted file mode 100644 index cad58ba6..00000000 --- a/src/main/resources/data/minecraft/tags/items/signs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_sign" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json deleted file mode 100644 index 56e1871c..00000000 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:chiselled_chitin_slab" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json deleted file mode 100644 index ddd6b7e3..00000000 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:chiselled_chitin_stairs" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/tools.json b/src/main/resources/data/minecraft/tags/items/tools.json deleted file mode 100644 index 1a41feac..00000000 --- a/src/main/resources/data/minecraft/tags/items/tools.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#unicopia:horse_shoes", - "#unicopia:polearms" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/src/main/resources/data/minecraft/tags/items/wooden_buttons.json deleted file mode 100644 index 276ebb11..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_button" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/main/resources/data/minecraft/tags/items/wooden_doors.json deleted file mode 100644 index b00445b2..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_doors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_door", - "unicopia:dark_oak_stable_door", - "unicopia:stable_door" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/src/main/resources/data/minecraft/tags/items/wooden_fences.json deleted file mode 100644 index e5c89b87..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_fences.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_fence", - "unicopia:zap_fence", - "unicopia:waxed_zap_fence" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json deleted file mode 100644 index 9b22cfff..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_pressure_plate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/src/main/resources/data/minecraft/tags/items/wooden_slabs.json deleted file mode 100644 index f464e8b0..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_slab", - "unicopia:zap_slab", - "unicopia:waxed_zap_slab" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/src/main/resources/data/minecraft/tags/items/wooden_stairs.json deleted file mode 100644 index 5549f9cb..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_stairs", - "unicopia:zap_stairs", - "unicopia:waxed_zap_stairs" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json deleted file mode 100644 index cddd514f..00000000 --- a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_trapdoor" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/carved_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/carved_cloud.json deleted file mode 100644 index 5457ca18..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/carved_cloud.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:carved_cloud" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin.json b/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin.json deleted file mode 100644 index bfeaa8b1..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:chiselled_chitin" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_slab.json deleted file mode 100644 index 0e262fa8..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_slab.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:chiselled_chitin_slab", - "functions": [ - { - "add": false, - "count": 2, - "function": "minecraft:set_count", - "conditions": [ - { - "block": "unicopia:chiselled_chitin_slab", - "condition": "minecraft:block_state_property", - "properties": { - "type": "double" - } - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_stairs.json deleted file mode 100644 index a3afe157..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/chiselled_chitin_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:chiselled_chitin_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chitin.json b/src/main/resources/data/unicopia/loot_tables/blocks/chitin.json deleted file mode 100644 index 3d92ed3d..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/chitin.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:carapace", - "functions": [ - { - "add": false, - "count": 9, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/chitin_spikes.json b/src/main/resources/data/unicopia/loot_tables/blocks/chitin_spikes.json deleted file mode 100644 index d40d0816..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/chitin_spikes.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:carapace", - "functions": [ - { - "add": false, - "count": 6, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloth_bed.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloth_bed.json deleted file mode 100644 index a962ce67..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloth_bed.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:cloth_bed", - "condition": "minecraft:block_state_property", - "properties": { - "part": "head" - } - } - ], - "name": "unicopia:cloth_bed" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json deleted file mode 100644 index 282d5ec9..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 4, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bed.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bed.json deleted file mode 100644 index 29561aae..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bed.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:cloud_bed", - "condition": "minecraft:block_state_property", - "properties": { - "part": "head" - } - } - ], - "name": "unicopia:cloud_bed" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_slab.json deleted file mode 100644 index 84bc3447..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_slab.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_brick_slab", - "functions": [ - { - "add": false, - "count": 2, - "function": "minecraft:set_count", - "conditions": [ - { - "block": "unicopia:cloud_brick_slab", - "condition": "minecraft:block_state_property", - "properties": { - "type": "double" - } - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_stairs.json deleted file mode 100644 index cd3e6120..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_brick_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_brick_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bricks.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bricks.json deleted file mode 100644 index bd4602d9..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_bricks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_bricks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_door.json deleted file mode 100644 index 2d948321..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_door.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:cloud_door", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "unicopia:cloud_door" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_pillar.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_pillar.json deleted file mode 100644 index 25c27a93..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_pillar.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud", - "functions": [ - { - "add": false, - "count": 6, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_slab.json deleted file mode 100644 index 64b9de8c..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_slab.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_plank_slab", - "functions": [ - { - "add": false, - "count": 2, - "function": "minecraft:set_count", - "conditions": [ - { - "block": "unicopia:cloud_plank_slab", - "condition": "minecraft:block_state_property", - "properties": { - "type": "double" - } - } - ] - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_stairs.json deleted file mode 100644 index 3fa584df..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_plank_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_plank_stairs" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_planks.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_planks.json deleted file mode 100644 index e0208139..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_planks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_planks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json deleted file mode 100644 index 2259e860..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/cloud_stairs.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 6, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/crystal_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/crystal_door.json deleted file mode 100644 index 15fd1392..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/crystal_door.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:crystal_door", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "unicopia:crystal_door" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/curing_joke.json b/src/main/resources/data/unicopia/loot_tables/blocks/curing_joke.json deleted file mode 100644 index 7a4cba95..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/curing_joke.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:curing_joke" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dark_oak_stable_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/dark_oak_stable_door.json deleted file mode 100644 index eb337eb8..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dark_oak_stable_door.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:dark_oak_stable_door", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "unicopia:dark_oak_stable_door" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json deleted file mode 100644 index 163e3667..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 9, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json deleted file mode 100644 index 80ba3be4..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/dense_cloud_stairs.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 13, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud.json deleted file mode 100644 index 163e3667..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 9, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud_stairs.json deleted file mode 100644 index 80ba3be4..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/etched_cloud_stairs.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud_lump", - "functions": [ - { - "add": false, - "count": 13, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json deleted file mode 100644 index 2676a033..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/flowering_zap_leaves.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:flowering_zap_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.05, - 0.0625, - 0.083333336, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "name": "unicopia:zapling" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/frosted_obsidian.json b/src/main/resources/data/unicopia/loot_tables/blocks/frosted_obsidian.json deleted file mode 100644 index 35bba516..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/frosted_obsidian.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:obsidian" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_leaves.json deleted file mode 100644 index 62c30a92..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_leaves.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:golden_oak_leaves" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:blaze_rod" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_log.json deleted file mode 100644 index 63a2ecb4..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:golden_oak_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_sapling.json deleted file mode 100644 index d97e4dfe..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/golden_oak_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:golden_oak_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple.json b/src/main/resources/data/unicopia/loot_tables/blocks/green_apple.json deleted file mode 100644 index 6f593d84..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:green_apple" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json deleted file mode 100644 index f31c928e..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_leaves.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:green_apple_leaves" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_sapling.json deleted file mode 100644 index 2b74e8cb..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/green_apple_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:green_apple_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/hive.json b/src/main/resources/data/unicopia/loot_tables/blocks/hive.json deleted file mode 100644 index ee8a6619..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/hive.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:hive" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/mango.json b/src/main/resources/data/unicopia/loot_tables/blocks/mango.json deleted file mode 100644 index d9e9e3d4..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/mango.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:mango" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/mango_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/mango_leaves.json deleted file mode 100644 index d48c4a30..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/mango_leaves.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:mango_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.05, - 0.0625, - 0.083333336, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "name": "unicopia:mango_sapling" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_button.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_button.json deleted file mode 100644 index a97e524b..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_button.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_button" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_door.json deleted file mode 100644 index f913d7ab..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_door.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:palm_door", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "unicopia:palm_door" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence.json deleted file mode 100644 index b758a545..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_fence" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence_gate.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence_gate.json deleted file mode 100644 index 45927061..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_fence_gate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_fence_gate" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_hanging_sign.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_hanging_sign.json deleted file mode 100644 index 093e13be..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_hanging_sign.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_sign" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json deleted file mode 100644 index 2e12cbe2..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_leaves.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:palm_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.05, - 0.0625, - 0.083333336, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "name": "unicopia:palm_sapling" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_log.json deleted file mode 100644 index e856aef5..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_planks.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_planks.json deleted file mode 100644 index cfe2c6a6..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_planks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_planks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_pressure_plate.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_pressure_plate.json deleted file mode 100644 index 099fce7b..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_pressure_plate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_pressure_plate" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_sapling.json deleted file mode 100644 index a5e70288..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_sign.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_sign.json deleted file mode 100644 index 093e13be..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_sign.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_sign" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_slab.json deleted file mode 100644 index 72b94222..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_slab" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_stairs.json deleted file mode 100644 index ca1c3edb..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_stairs" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_trapdoor.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_trapdoor.json deleted file mode 100644 index e9a45c67..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_trapdoor.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_trapdoor" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/palm_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/palm_wood.json deleted file mode 100644 index cc5db4c2..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/palm_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_golden_oak_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_golden_oak_sapling.json deleted file mode 100644 index 514f8e3a..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_golden_oak_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:golden_oak_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_green_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_green_apple_sapling.json deleted file mode 100644 index a648cbaf..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_green_apple_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:green_apple_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_mango_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_mango_sapling.json deleted file mode 100644 index 72ffe675..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_mango_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:mango_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_palm_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_palm_sapling.json deleted file mode 100644 index 8428fcdc..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_palm_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:palm_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_sour_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_sour_apple_sapling.json deleted file mode 100644 index 6e5b7e92..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_sour_apple_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sour_apple_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_sweet_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_sweet_apple_sapling.json deleted file mode 100644 index bc6aff30..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_sweet_apple_sapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sweet_apple_sapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/potted_zapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/potted_zapling.json deleted file mode 100644 index a93849c6..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/potted_zapling.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:flower_pot" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zapling" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:blocks/potted_dead_bush" -} diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud.json deleted file mode 100644 index a63862dc..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud_stairs.json deleted file mode 100644 index 25c27a93..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/soggy_cloud_stairs.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:cloud", - "functions": [ - { - "add": false, - "count": 6, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple.json b/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple.json deleted file mode 100644 index 72c4d970..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sour_apple" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json deleted file mode 100644 index 94406ba9..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_leaves.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:sour_apple_leaves" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_sapling.json deleted file mode 100644 index deece711..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sour_apple_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sour_apple_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/stable_door.json b/src/main/resources/data/unicopia/loot_tables/blocks/stable_door.json deleted file mode 100644 index edeff07c..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/stable_door.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "block": "unicopia:stable_door", - "condition": "minecraft:block_state_property", - "properties": { - "half": "lower" - } - } - ], - "name": "unicopia:stable_door" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_log.json deleted file mode 100644 index 10dd8193..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:stripped_palm_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_wood.json deleted file mode 100644 index ba34b411..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_palm_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:stripped_palm_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_log.json deleted file mode 100644 index c85a26c1..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:stripped_zap_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_wood.json deleted file mode 100644 index 7a1ee886..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/stripped_zap_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:stripped_zap_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/surface_chitin.json b/src/main/resources/data/unicopia/loot_tables/blocks/surface_chitin.json deleted file mode 100644 index 3d92ed3d..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/surface_chitin.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:carapace", - "functions": [ - { - "add": false, - "count": 9, - "function": "minecraft:set_count" - } - ] - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple.json b/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple.json deleted file mode 100644 index b8ed57c5..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sweet_apple" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json deleted file mode 100644 index cec41e60..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_leaves.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:sweet_apple_leaves" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_sapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_sapling.json deleted file mode 100644 index 7e34d5f6..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/sweet_apple_sapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:sweet_apple_sapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/unstable_cloud.json b/src/main/resources/data/unicopia/loot_tables/blocks/unstable_cloud.json deleted file mode 100644 index 6955bf13..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/unstable_cloud.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:unstable_cloud" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_log.json deleted file mode 100644 index 06af807c..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_stripped_zap_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_wood.json deleted file mode 100644 index 25b08c58..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_stripped_zap_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_stripped_zap_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence.json deleted file mode 100644 index d8f7aa05..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_fence" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence_gate.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence_gate.json deleted file mode 100644 index 035b8340..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_fence_gate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_fence_gate" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_log.json deleted file mode 100644 index 0607cf23..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_planks.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_planks.json deleted file mode 100644 index 42e39c73..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_planks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_planks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_slab.json deleted file mode 100644 index 561b61bc..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_slab" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_stairs.json deleted file mode 100644 index e2749e5d..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_stairs" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_wood.json deleted file mode 100644 index 703572f8..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/waxed_zap_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:waxed_zap_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/weather_vane.json b/src/main/resources/data/unicopia/loot_tables/blocks/weather_vane.json deleted file mode 100644 index 327c5fb3..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/weather_vane.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:weather_vane" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_apple.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_apple.json deleted file mode 100644 index 3400bb32..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_apple.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_apple" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_bulb.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_bulb.json deleted file mode 100644 index 2944030f..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_bulb.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_bulb" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence.json deleted file mode 100644 index ef403726..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_fence" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence_gate.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence_gate.json deleted file mode 100644 index edec2cd1..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_fence_gate.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_fence_gate" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json deleted file mode 100644 index e511233e..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_leaves.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "unicopia:zap_leaves" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.05, - 0.0625, - 0.083333336, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "name": "unicopia:zapling" - } - ] - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "chances": [ - 0.02, - 0.022222223, - 0.025, - 0.033333335, - 0.1 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - } - ], - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "minecraft:stick" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_log.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_log.json deleted file mode 100644 index c8e82cb7..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_log.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_log" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_planks.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_planks.json deleted file mode 100644 index d0593f6a..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_planks.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_planks" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_slab.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_slab.json deleted file mode 100644 index 549f4877..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_slab.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_slab" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_stairs.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_stairs.json deleted file mode 100644 index 46c2d001..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_stairs" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zap_wood.json b/src/main/resources/data/unicopia/loot_tables/blocks/zap_wood.json deleted file mode 100644 index 7eaab0a0..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zap_wood.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zap_wood" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/loot_tables/blocks/zapling.json b/src/main/resources/data/unicopia/loot_tables/blocks/zapling.json deleted file mode 100644 index 508f8ba3..00000000 --- a/src/main/resources/data/unicopia/loot_tables/blocks/zapling.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:zapling" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json b/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json deleted file mode 100644 index 7b7efde0..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/catapult_immune.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:bedrock", - "#minecraft:doors" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/cloud_beds.json b/src/main/resources/data/unicopia/tags/blocks/cloud_beds.json deleted file mode 100644 index 4338e8fd..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/cloud_beds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_bed" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/cloud_slabs.json b/src/main/resources/data/unicopia/tags/blocks/cloud_slabs.json deleted file mode 100644 index 3a2b1dc1..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/cloud_slabs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_slab", - "unicopia:soggy_cloud_slab", - "unicopia:dense_cloud_slab", - "unicopia:etched_cloud_slab", - "unicopia:cloud_plank_slab", - "unicopia:cloud_brick_slab" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/cloud_stairs.json b/src/main/resources/data/unicopia/tags/blocks/cloud_stairs.json deleted file mode 100644 index 7f816bb4..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/cloud_stairs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_stairs", - "unicopia:soggy_cloud_stairs", - "unicopia:dense_cloud_stairs", - "unicopia:etched_cloud_stairs", - "unicopia:cloud_plank_stairs", - "unicopia:cloud_brick_stairs" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/clouds.json b/src/main/resources/data/unicopia/tags/blocks/clouds.json deleted file mode 100644 index 911abcd4..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/clouds.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud", - "unicopia:cloud_planks", - "unicopia:cloud_bricks", - "unicopia:dense_cloud", - "unicopia:etched_cloud", - "unicopia:carved_cloud", - "unicopia:compacted_cloud", - "unicopia:compacted_cloud_planks", - "unicopia:unstable_cloud", - "unicopia:soggy_cloud" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/mineable/polearm.json b/src/main/resources/data/unicopia/tags/blocks/mineable/polearm.json deleted file mode 100644 index 11c84d4c..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/mineable/polearm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:zap_leaves", - "unicopia:zap_log" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/horse_shoes.json b/src/main/resources/data/unicopia/tags/items/horse_shoes.json deleted file mode 100644 index ca3dcfd4..00000000 --- a/src/main/resources/data/unicopia/tags/items/horse_shoes.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:iron_horse_shoe", - "unicopia:golden_horse_shoe", - "unicopia:copper_horse_shoe", - "unicopia:netherite_horse_shoe" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/polearms.json b/src/main/resources/data/unicopia/tags/items/polearms.json deleted file mode 100644 index 54736807..00000000 --- a/src/main/resources/data/unicopia/tags/items/polearms.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:wooden_polearm", - "unicopia:stone_polearm", - "unicopia:iron_polearm", - "unicopia:golden_polearm", - "unicopia:diamond_polearm", - "unicopia:netherite_polearm" - ] -} From e07377f91e6803e5093fd17f4e5cf5a0b300fe63 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 00:35:17 +0000 Subject: [PATCH 29/44] Fixed unicopia loot replacing vanilla drops for blocks instead of adding to it --- .../com/minelittlepony/unicopia/item/URecipes.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/item/URecipes.java b/src/main/java/com/minelittlepony/unicopia/item/URecipes.java index 0c509917..52aff325 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/URecipes.java +++ b/src/main/java/com/minelittlepony/unicopia/item/URecipes.java @@ -58,11 +58,17 @@ public interface URecipes { LootTable table = manager.getLootTable(modId); if (table != LootTable.EMPTY) { - supplier.modifyPools(poolBuilder -> { + if (id.getPath().startsWith("blocks/")) { for (var pool : table.pools) { - poolBuilder.with(List.of(pool.entries)); + supplier.pool(pool); } - }); + } else { + supplier.modifyPools(poolBuilder -> { + for (var pool : table.pools) { + poolBuilder.with(List.of(pool.entries)); + } + }); + } } }); } From 00b625815cd0f7e2ca65a14990c4230ee288439c Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 13:12:40 +0000 Subject: [PATCH 30/44] Move vanilla loot tables to datagen. Changes: - Fixed coarse dirt not dropping gemstones or wheat worms - Fixed desert well loot tables - Adjusted looting amounts in some places - Gemstone and wheatworm drops are now affected by looting - All crops are now recognised by bees and will preserve farmland --- .../unicopia/datagen/Datagen.java | 6 +- .../datagen/providers/UModelProvider.java | 2 +- .../UBlockAdditionsLootTableProvider.java | 126 ++++++++++++++++++ .../{ => loot}/UBlockLootTableProvider.java | 7 +- .../UChestAdditionsLootTableProvider.java | 109 +++++++++++++++ .../loot_tables/archaeology/desert_well.json | 54 -------- .../archaeology/trail_ruins_common.json | 27 ---- .../archaeology/trail_ruins_rare.json | 27 ---- .../loot_tables/blocks/course_dirt.json | 92 ------------- .../blocks/deepslate_diamond_ore.json | 49 ------- .../loot_tables/blocks/diamond_ore.json | 49 ------- .../unicopiamc/loot_tables/blocks/dirt.json | 92 ------------- .../unicopiamc/loot_tables/blocks/grass.json | 55 -------- .../loot_tables/blocks/grass_block.json | 92 ------------- .../loot_tables/blocks/mycelium.json | 55 -------- .../unicopiamc/loot_tables/blocks/podzol.json | 55 -------- .../unicopiamc/loot_tables/blocks/stone.json | 66 --------- .../chests/abandoned_mineshaft.json | 29 ---- .../loot_tables/chests/ancient_city.json | 19 --- .../loot_tables/chests/buried_treasure.json | 25 ---- .../loot_tables/chests/shipwreck_supply.json | 20 --- .../chests/shipwreck_treasure.json | 25 ---- .../chests/underwater_ruin_big.json | 30 ----- .../chests/underwater_ruin_small.json | 20 --- .../chests/village/village_fletcher.json | 29 ---- .../chests/village/village_plains_house.json | 26 ---- .../loot_tables/chests/woodland_mansion.json | 60 --------- 27 files changed, 245 insertions(+), 1001 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java rename src/main/java/com/minelittlepony/unicopia/datagen/providers/{ => loot}/UBlockLootTableProvider.java (97%) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/archaeology/desert_well.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_common.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_rare.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/course_dirt.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/deepslate_diamond_ore.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/diamond_ore.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/dirt.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/grass.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/grass_block.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/mycelium.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/podzol.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/blocks/stone.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/abandoned_mineshaft.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/ancient_city.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/buried_treasure.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_supply.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_treasure.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_big.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_small.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/village/village_fletcher.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/village/village_plains_house.json delete mode 100644 src/main/resources/data/unicopiamc/loot_tables/chests/woodland_mansion.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java index 68e013d8..378a8d79 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -1,10 +1,12 @@ package com.minelittlepony.unicopia.datagen; -import com.minelittlepony.unicopia.datagen.providers.UBlockLootTableProvider; import com.minelittlepony.unicopia.datagen.providers.UBlockTagProvider; import com.minelittlepony.unicopia.datagen.providers.UItemTagProvider; import com.minelittlepony.unicopia.datagen.providers.UModelProvider; import com.minelittlepony.unicopia.datagen.providers.URecipeProvider; +import com.minelittlepony.unicopia.datagen.providers.loot.UBlockAdditionsLootTableProvider; +import com.minelittlepony.unicopia.datagen.providers.loot.UBlockLootTableProvider; +import com.minelittlepony.unicopia.datagen.providers.loot.UChestAdditionsLootTableProvider; import com.minelittlepony.unicopia.server.world.UWorldGen; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; @@ -27,6 +29,8 @@ public class Datagen implements DataGeneratorEntrypoint { pack.addProvider(UModelProvider::new); pack.addProvider(URecipeProvider::new); pack.addProvider(UBlockLootTableProvider::new); + pack.addProvider(UBlockAdditionsLootTableProvider::new); + pack.addProvider(UChestAdditionsLootTableProvider::new); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index f0993a97..2d82fdff 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -20,7 +20,7 @@ import net.minecraft.data.client.TextureKey; import net.minecraft.data.client.TextureMap; public class UModelProvider extends FabricModelProvider { - static final Map FRUITS = Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, + public static final Map FRUITS = Map.of(UBlocks.GREEN_APPLE, UItems.GREEN_APPLE, UBlocks.GOLDEN_APPLE, Items.GOLDEN_APPLE, UBlocks.MANGO, UItems.MANGO, UBlocks.SOUR_APPLE, UItems.SOUR_APPLE, diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java new file mode 100644 index 00000000..9788e234 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockAdditionsLootTableProvider.java @@ -0,0 +1,126 @@ +package com.minelittlepony.unicopia.datagen.providers.loot; + +import java.util.function.Function; + +import com.minelittlepony.unicopia.item.UItems; +import com.minelittlepony.unicopia.item.enchantment.UEnchantments; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.condition.LootCondition; +import net.minecraft.loot.condition.MatchToolLootCondition; +import net.minecraft.loot.condition.RandomChanceLootCondition; +import net.minecraft.loot.condition.TableBonusLootCondition; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.entry.LootPoolEntry; +import net.minecraft.loot.function.ApplyBonusLootFunction; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.ConstantLootNumberProvider; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; +import net.minecraft.predicate.NumberRange; +import net.minecraft.predicate.item.EnchantmentPredicate; +import net.minecraft.predicate.item.ItemPredicate; +import net.minecraft.util.Identifier; + +public class UBlockAdditionsLootTableProvider extends FabricBlockLootTableProvider { + public static final LootCondition.Builder WITH_GEM_FINDER = MatchToolLootCondition.builder(ItemPredicate.Builder.create().enchantment(new EnchantmentPredicate(UEnchantments.GEM_FINDER, NumberRange.IntRange.atLeast(1)))); + + public static final LootCondition.Builder WITHOUT_SILK_TOUCH_AND_GEM_FINDER = WITHOUT_SILK_TOUCH.and(WITH_GEM_FINDER); + public static final float[] GEMSTONES_FORTUNE_CHANCE = { 0.1F, 0.14285715F, 0.25F, 1F }; + + public UBlockAdditionsLootTableProvider(FabricDataOutput dataOutput) { + super(dataOutput); + } + + @Override + public String getName() { + return "Block Loot Table Additions"; + } + + @Override + public void generate() { + addVanillaDrop(Blocks.STONE, this::gemstoneDrops); + addVanillaDrop(Blocks.DIRT, block -> gemstoneAndWormDrops(block, 2, 0.05F, 0.052222223F, 0.055F, 0.066666665F, 0.1F)); + addVanillaDrop(Blocks.COARSE_DIRT, block -> gemstoneAndWormDrops(block, 2, 0.05F, 0.052222223F, 0.055F, 0.066666665F, 0.1F)); + addVanillaDrop(Blocks.GRASS_BLOCK, block -> gemstoneAndWormDrops(block, 2, 0.05F, 0.052222223F, 0.055F, 0.066666665F, 0.1F)); + addVanillaDrop(Blocks.GRASS, block -> wormDrops(block, 2, 0.05F, 0.052222223F, 0.055F, 0.066666665F, 0.1F)); + addVanillaDrop(Blocks.MYCELIUM, block -> wormDrops(block, 3, 0.06F, 0.062222223F, 0.065F, 0.077777776F, 0.2F)); + addVanillaDrop(Blocks.PODZOL, block -> wormDrops(block, 4, 0.06F, 0.062222223F, 0.065F, 0.077777776F, 0.2F)); + addVanillaDrop(Blocks.DIAMOND_ORE, this::crystalShardDrops); + addVanillaDrop(Blocks.DEEPSLATE_DIAMOND_ORE, this::crystalShardDrops); + } + + private void addVanillaDrop(Block block, Function lootTableFunction) { + lootTables.put(new Identifier("unicopiamc", block.getLootTableId().getPath()), lootTableFunction.apply(block)); + } + + public LootTable.Builder wormDrops(Block block, int max, float...chance) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH) + .with(wheatwormDrops(block, max, chance)) + ); + } + + public LootTable.Builder gemstoneAndWormDrops(Block block, int max, float...chance) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH) + .with(gemstoneDrops(block, 0.1F)) + .with(wheatwormDrops(block, max, chance)) + ); + } + + public LootTable.Builder gemstoneDrops(Block block) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH) + .with(gemstoneDrops(block, 0.1F)) + ); + } + + public LootTable.Builder crystalShardDrops(Block block) { + return LootTable.builder() + .pool(LootPool.builder() + .rolls(ConstantLootNumberProvider.create(1)) + .conditionally(WITHOUT_SILK_TOUCH) + .with(applyExplosionDecay(block, ItemEntry.builder(UItems.CRYSTAL_SHARD) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2))) + .apply(ApplyBonusLootFunction.oreDrops(Enchantments.FORTUNE)) + ) + .conditionally(RandomChanceLootCondition.builder(0.25F)) + ) + ); + } + + public LootPoolEntry.Builder gemstoneDrops(Block block, float chance) { + return applyExplosionDecay(block, ItemEntry.builder(UItems.GEMSTONE) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2))) + ) + .conditionally(WITH_GEM_FINDER) + .conditionally(RandomChanceLootCondition.builder(0.1F)) + .conditionally(TableBonusLootCondition.builder(Enchantments.FORTUNE, GEMSTONES_FORTUNE_CHANCE)); + } + + public LootPoolEntry.Builder wheatwormDrops(Block block, int max, float...chance) { + return applyExplosionDecay(block, ItemEntry.builder(UItems.WHEAT_WORMS) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, max))) + ) + .conditionally(TableBonusLootCondition.builder(Enchantments.FORTUNE, chance)); + } + + + public static LootTable.Builder dropsWithGemfinding(Block drop, LootPoolEntry.Builder child) { + return BlockLootTableGenerator.drops(drop, WITHOUT_SILK_TOUCH_AND_GEM_FINDER, child); + } + +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockLootTableProvider.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java rename to src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockLootTableProvider.java index d099100a..34db9593 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockLootTableProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockLootTableProvider.java @@ -1,7 +1,8 @@ -package com.minelittlepony.unicopia.datagen.providers; +package com.minelittlepony.unicopia.datagen.providers.loot; import java.util.List; import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.providers.UModelProvider; import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.server.world.Tree; import com.minelittlepony.unicopia.server.world.UTreeGen; @@ -30,7 +31,6 @@ public class UBlockLootTableProvider extends FabricBlockLootTableProvider { @Override public void generate() { - // simple drops List.of( UBlocks.CARVED_CLOUD, UBlocks.UNSTABLE_CLOUD, @@ -111,7 +111,7 @@ public class UBlockLootTableProvider extends FabricBlockLootTableProvider { addDrop(UBlocks.FROSTED_OBSIDIAN, Blocks.OBSIDIAN); } - public LootTable.Builder fruitLeavesDrops(Block leaves) { + private LootTable.Builder fruitLeavesDrops(Block leaves) { return LootTable.builder() .pool(LootPool.builder() .rolls(ConstantLootNumberProvider.create(1)) @@ -128,4 +128,5 @@ public class UBlockLootTableProvider extends FabricBlockLootTableProvider { ) ); } + } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java new file mode 100644 index 00000000..0fc19ba0 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java @@ -0,0 +1,109 @@ +package com.minelittlepony.unicopia.datagen.providers.loot; + +import java.util.function.BiConsumer; + +import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.item.UItems; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.SimpleFabricLootTableProvider; +import net.minecraft.loot.LootTable.Builder; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.LootTables; +import net.minecraft.loot.context.LootContextTypes; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.entry.TagEntry; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; +import net.minecraft.util.Identifier; + +public class UChestAdditionsLootTableProvider extends SimpleFabricLootTableProvider { + + public UChestAdditionsLootTableProvider(FabricDataOutput dataOutput) { + super(dataOutput, LootContextTypes.CHEST); + } + + + @Override + public void accept(BiConsumer exporter) { + acceptAdditions((id, builder) -> exporter.accept(new Identifier("unicopiamc", id.getPath()), builder)); + } + + public void acceptAdditions(BiConsumer exporter) { + exporter.accept(LootTables.ABANDONED_MINESHAFT_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(2, 4)) + .with(ItemEntry.builder(UItems.GRYPHON_FEATHER).weight(2).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 4)))) + )); + exporter.accept(LootTables.WOODLAND_MANSION_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(2, 4)) + .with(ItemEntry.builder(UItems.GRYPHON_FEATHER).weight(10).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 7)))) + .with(ItemEntry.builder(UItems.GOLDEN_WING).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2)))) + .with(TagEntry.expandBuilder(UTags.FRESH_APPLES).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(2, 5)))) + )); + exporter.accept(LootTables.VILLAGE_FLETCHER_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(2, 4)) + .with(ItemEntry.builder(UItems.GRYPHON_FEATHER).weight(10).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2)))) + .with(ItemEntry.builder(UItems.PEGASUS_FEATHER).weight(1).apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(1, 2)))) + )); + exporter.accept(LootTables.VILLAGE_PLAINS_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(3, 4)) + .with(TagEntry.expandBuilder(UTags.FRESH_APPLES).weight(1)) + .with(TagEntry.expandBuilder(UTags.APPLE_SEEDS).weight(1)) + )); + + exporter.accept(LootTables.ANCIENT_CITY_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(0, 1)) + .with(ItemEntry.builder(UItems.GROGARS_BELL).weight(1)) + )); + exporter.accept(LootTables.BURIED_TREASURE_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(3)) + )); + exporter.accept(LootTables.SHIPWRECK_SUPPLY_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 6)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(3)) + )); + exporter.accept(LootTables.SHIPWRECK_TREASURE_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(3)) + )); + exporter.accept(LootTables.UNDERWATER_RUIN_BIG_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 2)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + .with(ItemEntry.builder(UItems.SHELLY).weight(4)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(8)) + )); + exporter.accept(LootTables.UNDERWATER_RUIN_SMALL_CHEST, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(1)) + )); + + exporter.accept(LootTables.DESERT_WELL_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.WEIRD_ROCK).weight(2)) + .with(ItemEntry.builder(UItems.ROCK).weight(1)) + .with(ItemEntry.builder(UItems.TOM).weight(1)) + .with(ItemEntry.builder(UItems.ROCK_STEW).weight(1)) + .with(ItemEntry.builder(UItems.PEBBLES).weight(1)) + .with(ItemEntry.builder(UItems.SHELLY).weight(1)) + .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(1)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + )); + exporter.accept(LootTables.TRAIL_RUINS_COMMON_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.MEADOWBROOKS_STAFF).weight(2)) + .with(ItemEntry.builder(UItems.BOTCHED_GEM).weight(3)) + .with(ItemEntry.builder(UItems.PEGASUS_FEATHER).weight(1)) + )); + exporter.accept(LootTables.TRAIL_RUINS_RARE_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.BROKEN_SUNGLASSES).weight(2)) + .with(ItemEntry.builder(UItems.EMPTY_JAR).weight(2)) + .with(ItemEntry.builder(UItems.MUSIC_DISC_CRUSADE).weight(1)) + )); + } + +} diff --git a/src/main/resources/data/unicopiamc/loot_tables/archaeology/desert_well.json b/src/main/resources/data/unicopiamc/loot_tables/archaeology/desert_well.json deleted file mode 100644 index c6c149e1..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/archaeology/desert_well.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "type": "minecraft:archaeology", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:weird_rock", - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "unicopia:rock", - "weight": 1 - }, - { - "type": "minecraft:item", - "name": "unicopia:tom", - "weight": 1 - }, - { - "type": "minecraft:item", - "name": "unicopia:rock_stew", - "weight": 1 - }, - { - "type": "minecraft:item", - "name": "unicopia:pebbles", - "weight": 1 - }, - { - "type": "minecraft:item", - "name": "unicopia:shelly", - "weight": 1 - }, - { - "type": "minecraft:tag", - "name": "unicopia:food_types/shells", - "expand": true, - "weight": 2 - }, - { - "type": "minecraft:tag", - "name": "unicopia:food_types/pearl_necklace", - "expand": true, - "weight": 1 - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:archaeology/desert_well" -} diff --git a/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_common.json b/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_common.json deleted file mode 100644 index 0aac2574..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_common.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:archaeology", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:meadowbrooks_staff", - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "unicopia:botched_gem", - "weight": 3 - }, - { - "type": "minecraft:item", - "name": "unicopia:pegasus_feather", - "weight": 1 - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:archaeology/desert_well" -} diff --git a/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_rare.json b/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_rare.json deleted file mode 100644 index 83b35921..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/archaeology/trail_ruins_rare.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "type": "minecraft:archaeology", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "unicopia:broken_sunglasses", - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "unicopia:empty_jar", - "weight": 2 - }, - { - "type": "minecraft:item", - "name": "unicopia:music_disc_crusade", - "weight": 1 - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "minecraft:archaeology/desert_well" -} diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/course_dirt.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/course_dirt.json deleted file mode 100644 index 59a324ee..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/course_dirt.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "unicopia:gem_finder", - "levels": { - "min": 1 - } - } - ] - } - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "unicopia:gem_finder", - "chances": [ 0.060555554 ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:gemstone" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:wheat_worms" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/deepslate_diamond_ore.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/deepslate_diamond_ore.json deleted file mode 100644 index d41e3586..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/deepslate_diamond_ore.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:crystal_shard" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/diamond_ore.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/diamond_ore.json deleted file mode 100644 index d41e3586..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/diamond_ore.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.25 - } - ], - "functions": [ - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:crystal_shard" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/dirt.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/dirt.json deleted file mode 100644 index bc5666d4..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/dirt.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "unicopia:gem_finder", - "levels": { - "min": 1 - } - } - ] - } - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "unicopia:gem_finder", - "chances": [ 0.055555554 ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:gemstone" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:wheat_worms" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/grass.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/grass.json deleted file mode 100644 index fe240928..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/grass.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:oat_seeds" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/grass_block.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/grass_block.json deleted file mode 100644 index bc5666d4..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/grass_block.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "unicopia:gem_finder", - "levels": { - "min": 1 - } - } - ] - } - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "unicopia:gem_finder", - "chances": [ 0.055555554 ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:gemstone" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:wheat_worms" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/mycelium.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/mycelium.json deleted file mode 100644 index d1e9ce9c..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/mycelium.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 3.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:wheat_worms" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/podzol.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/podzol.json deleted file mode 100644 index 072c3e61..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/podzol.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune", - "chances": [ - 0.05, 0.052222223, 0.055, 0.066666665, 0.1 - ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 4.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:wheat_worms" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/blocks/stone.json b/src/main/resources/data/unicopiamc/loot_tables/blocks/stone.json deleted file mode 100644 index e0bd3810..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/blocks/stone.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "entries": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "unicopia:gem_finder", - "levels": { - "min": 1 - } - } - ] - } - }, - { - "condition": "minecraft:table_bonus", - "enchantment": "unicopia:gem_finder", - "chances": [ 0.1 ] - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "unicopia:gemstone" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/abandoned_mineshaft.json b/src/main/resources/data/unicopiamc/loot_tables/chests/abandoned_mineshaft.json deleted file mode 100644 index 2929b936..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/abandoned_mineshaft.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 2, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 5.0, - "type": "minecraft:uniform" - } - } - ], - "name": "unicopia:gryphon_feather" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/ancient_city.json b/src/main/resources/data/unicopiamc/loot_tables/chests/ancient_city.json deleted file mode 100644 index 4f78427a..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/ancient_city.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 0.0, - "max": 1.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "unicopia:grogars_bell" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/buried_treasure.json b/src/main/resources/data/unicopiamc/loot_tables/chests/buried_treasure.json deleted file mode 100644 index d94e9dc6..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/buried_treasure.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 1.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "unicopia:pearl_necklace" - }, - { - "type": "minecraft:tag", - "weight": 3, - "expand": true, - "name": "unicopia:food_types/shells" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_supply.json b/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_supply.json deleted file mode 100644 index 4181ec0e..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_supply.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 1.0, - "max": 6.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:tag", - "weight": 3, - "expand": true, - "name": "unicopia:food_types/shells" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_treasure.json b/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_treasure.json deleted file mode 100644 index d94e9dc6..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/shipwreck_treasure.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 1.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "unicopia:pearl_necklace" - }, - { - "type": "minecraft:tag", - "weight": 3, - "expand": true, - "name": "unicopia:food_types/shells" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_big.json b/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_big.json deleted file mode 100644 index a4eea670..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_big.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 1, - "name": "unicopia:pearl_necklace" - }, - { - "type": "minecraft:item", - "weight": 4, - "name": "unicopia:shelly" - }, - { - "type": "minecraft:tag", - "weight": 8, - "expand": true, - "name": "unicopia:food_types/shells" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_small.json b/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_small.json deleted file mode 100644 index 31d47b83..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/underwater_ruin_small.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 1.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:tag", - "weight": 1, - "expand": true, - "name": "unicopia:food_types/shells" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_fletcher.json b/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_fletcher.json deleted file mode 100644 index 108e971b..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_fletcher.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - } - ], - "name": "unicopia:gryphon_feather" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_plains_house.json b/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_plains_house.json deleted file mode 100644 index f8d7b0b5..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/village/village_plains_house.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:tag", - "name": "unicopia:fresh_apples", - "expand": true, - "weight": 1 - }, - { - "type": "minecraft:tag", - "name": "unicopia:apple_seeds", - "expand": true - } - ], - "rolls": { - "type": "minecraft:uniform", - "max": 8.0, - "min": 3.0 - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/unicopiamc/loot_tables/chests/woodland_mansion.json b/src/main/resources/data/unicopiamc/loot_tables/chests/woodland_mansion.json deleted file mode 100644 index a7b185fe..00000000 --- a/src/main/resources/data/unicopiamc/loot_tables/chests/woodland_mansion.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "rolls": { - "min": 2.0, - "max": 4.0, - "type": "minecraft:uniform" - }, - "entries": [ - { - "type": "minecraft:item", - "weight": 10, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 7.0, - "type": "minecraft:uniform" - } - } - ], - "name": "unicopia:gryphon_feather" - }, - { - "type": "minecraft:item", - "weight": 1, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1.0, - "max": 2.0, - "type": "minecraft:uniform" - } - } - ], - "name": "unicopia:golden_wing" - }, - { - "type": "minecraft:tag", - "weight": 1, - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 2.0, - "max": 5.0, - "type": "minecraft:uniform" - } - } - ], - "expand": true, - "name": "unicopia:fresh_apples" - } - ] - } - ] -} \ No newline at end of file From 731de7572f878435c6116533a449d31f3412cbcf Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 13:22:39 +0000 Subject: [PATCH 31/44] Add shells to fishing loot tables. Closes #299 --- .../com/minelittlepony/unicopia/UTags.java | 2 + .../UChestAdditionsLootTableProvider.java | 39 ++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index 08da479c..2524d64a 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -28,6 +28,8 @@ public interface UTags { TagKey FLOATS_ON_CLOUDS = item("floats_on_clouds"); TagKey COOLS_OFF_KIRINS = item("cools_off_kirins"); + TagKey SHELLS = item("food_types/shells"); + TagKey POLEARMS = item("polearms"); TagKey HORSE_SHOES = item("horse_shoes"); TagKey APPLE_SEEDS = item("apple_seeds"); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java index 0fc19ba0..72ad8a91 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java @@ -63,22 +63,22 @@ public class UChestAdditionsLootTableProvider extends SimpleFabricLootTableProvi )); exporter.accept(LootTables.SHIPWRECK_SUPPLY_CHEST, LootTable.builder().pool(LootPool.builder() .rolls(UniformLootNumberProvider.create(1, 6)) - .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(3)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(3)) )); exporter.accept(LootTables.SHIPWRECK_TREASURE_CHEST, LootTable.builder().pool(LootPool.builder() .rolls(UniformLootNumberProvider.create(1, 4)) .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) - .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(3)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(3)) )); exporter.accept(LootTables.UNDERWATER_RUIN_BIG_CHEST, LootTable.builder().pool(LootPool.builder() .rolls(UniformLootNumberProvider.create(1, 2)) .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) .with(ItemEntry.builder(UItems.SHELLY).weight(4)) - .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(8)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(8)) )); exporter.accept(LootTables.UNDERWATER_RUIN_SMALL_CHEST, LootTable.builder().pool(LootPool.builder() .rolls(UniformLootNumberProvider.create(1, 4)) - .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(1)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(1)) )); exporter.accept(LootTables.DESERT_WELL_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() @@ -89,7 +89,7 @@ public class UChestAdditionsLootTableProvider extends SimpleFabricLootTableProvi .with(ItemEntry.builder(UItems.ROCK_STEW).weight(1)) .with(ItemEntry.builder(UItems.PEBBLES).weight(1)) .with(ItemEntry.builder(UItems.SHELLY).weight(1)) - .with(TagEntry.expandBuilder(UTags.item("food_types/shells")).weight(1)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(1)) .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) )); exporter.accept(LootTables.TRAIL_RUINS_COMMON_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() @@ -104,6 +104,35 @@ public class UChestAdditionsLootTableProvider extends SimpleFabricLootTableProvi .with(ItemEntry.builder(UItems.EMPTY_JAR).weight(2)) .with(ItemEntry.builder(UItems.MUSIC_DISC_CRUSADE).weight(1)) )); + exporter.accept(LootTables.OCEAN_RUIN_WARM_ARCHAEOLOGY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(1)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + )); + + exporter.accept(LootTables.FISHING_GAMEPLAY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(TagEntry.expandBuilder(UTags.SHELLS).weight(2)) + )); + + exporter.accept(LootTables.FISHING_JUNK_GAMEPLAY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.BROKEN_SUNGLASSES).weight(2)) + .with(ItemEntry.builder(UItems.WHEAT_WORMS).weight(2)) + .with(ItemEntry.builder(UItems.BOTCHED_GEM).weight(4)) + )); + + exporter.accept(LootTables.FISHING_TREASURE_GAMEPLAY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + .with(ItemEntry.builder(UItems.SHELLY).weight(1)) + )); + + exporter.accept(LootTables.HERO_OF_THE_VILLAGE_FISHERMAN_GIFT_GAMEPLAY, LootTable.builder().pool(LootPool.builder() + .rolls(UniformLootNumberProvider.create(1, 4)) + .with(ItemEntry.builder(UItems.PEARL_NECKLACE).weight(1)) + .with(ItemEntry.builder(UItems.SHELLY).weight(1)) + )); } } From 7bad93044d2c859789d0904b54d8e5eca6886c92 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 13:57:56 +0000 Subject: [PATCH 32/44] Move remaining block tags to datagen --- .../datagen/providers/UBlockTagProvider.java | 47 ++++++++++++++++--- .../tags/blocks/crystal_heart_base.json | 18 ------- .../tags/blocks/crystal_heart_ornament.json | 6 --- .../data/unicopia/tags/blocks/fragile.json | 9 ---- .../unicopia/tags/blocks/glass_blocks.json | 6 --- .../unicopia/tags/blocks/glass_panes.json | 6 --- .../unicopia/tags/blocks/interesting.json | 11 ----- .../unicopia/tags/blocks/kicks_up_dust.json | 9 ---- .../data/unicopia/tags/blocks/palm_logs.json | 9 ---- .../blocks/unaffected_by_grow_ability.json | 6 --- 10 files changed, 41 insertions(+), 86 deletions(-) delete mode 100644 src/main/resources/data/unicopia/tags/blocks/crystal_heart_base.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/crystal_heart_ornament.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/fragile.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/glass_blocks.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/glass_panes.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/interesting.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/kicks_up_dust.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/palm_logs.json delete mode 100644 src/main/resources/data/unicopia/tags/blocks/unaffected_by_grow_ability.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java index 64fa1437..5995a6d8 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java @@ -9,11 +9,15 @@ import com.minelittlepony.unicopia.server.world.Tree; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { public UBlockTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { @@ -45,6 +49,31 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { addChitinBlocksets(); addHayBlocks(); addFruitTrees(); + + getOrCreateTagBuilder(UTags.CRYSTAL_HEART_BASE).add( + Blocks.DIAMOND_BLOCK, + Blocks.QUARTZ_BLOCK, Blocks.QUARTZ_BRICKS, Blocks.QUARTZ_SLAB, Blocks.QUARTZ_STAIRS, Blocks.QUARTZ_PILLAR, + Blocks.SMOOTH_QUARTZ, Blocks.SMOOTH_QUARTZ_SLAB, Blocks.SMOOTH_QUARTZ_STAIRS, Blocks.CHISELED_QUARTZ_BLOCK, + Blocks.AMETHYST_BLOCK, Blocks.NETHERITE_BLOCK, Blocks.EMERALD_BLOCK + ); + getOrCreateTagBuilder(UTags.CRYSTAL_HEART_ORNAMENT).add(Blocks.END_ROD); + + getOrCreateTagBuilder(UTags.FRAGILE) + .forceAddTag(ConventionalBlockTags.GLASS_BLOCKS) + .forceAddTag(ConventionalBlockTags.GLASS_PANES) + .add(Blocks.VINE, Blocks.LILY_PAD); + + getOrCreateTagBuilder(UTags.INTERESTING).add( + Blocks.SEA_LANTERN, Blocks.ENDER_CHEST, Blocks.END_PORTAL_FRAME, + Blocks.JUKEBOX, Blocks.SPAWNER + ).forceAddTag(ConventionalBlockTags.ORES); + + getOrCreateTagBuilder(UTags.KICKS_UP_DUST).forceAddTag(BlockTags.SAND).add( + Blocks.SUSPICIOUS_SAND, + Blocks.GRAVEL, Blocks.SUSPICIOUS_GRAVEL + ).forceAddTag(TagKey.of(RegistryKeys.BLOCK, new Identifier("c", "concrete_powders"))); + + getOrCreateTagBuilder(UTags.UNAFFECTED_BY_GROW_ABILITY).add(Blocks.GRASS_BLOCK); } private void addFruitTrees() { @@ -78,9 +107,13 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { UBlocks.ZAP_STAIRS ); - Block[] burnableLogs = { UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD }; - getOrCreateTagBuilder(BlockTags.LOGS).add(burnableLogs).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(burnableLogs); + TagKey logsTag = UTags.block("zap_logs"); + TagKey waxedLogsTag = UTags.block("waxed_zap_logs"); + + getOrCreateTagBuilder(logsTag).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(waxedLogsTag).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag).forceAddTag(waxedLogsTag); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.ZAP_PLANKS, UBlocks.WAXED_ZAP_PLANKS); //getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.ZAP_BUTTON); @@ -101,9 +134,11 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.PALM_LEAVES); getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.PALM_LEAVES); - Block[] logs = { UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD }; - getOrCreateTagBuilder(BlockTags.LOGS).add(logs); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).add(logs); + TagKey logsTag = UTags.block("palm_logs"); + + getOrCreateTagBuilder(logsTag).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.PALM_PLANKS); addSign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.PALM_BUTTON); diff --git a/src/main/resources/data/unicopia/tags/blocks/crystal_heart_base.json b/src/main/resources/data/unicopia/tags/blocks/crystal_heart_base.json deleted file mode 100644 index 47de02d4..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/crystal_heart_base.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:diamond_block", - "minecraft:quartz_block", - "minecraft:quartz_bricks", - "minecraft:quartz_slab", - "minecraft:quartz_stairs", - "minecraft:quartz_pillar", - "minecraft:smooth_quartz", - "minecraft:smooth_quartz_slab", - "minecraft:smooth_quartz_stairs", - "minecraft:chiseled_quartz_block", - "minecraft:amethyst_block", - "minecraft:netherite_block", - "minecraft:emerald_block" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/crystal_heart_ornament.json b/src/main/resources/data/unicopia/tags/blocks/crystal_heart_ornament.json deleted file mode 100644 index 770f0fe5..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/crystal_heart_ornament.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:end_rod" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/fragile.json b/src/main/resources/data/unicopia/tags/blocks/fragile.json deleted file mode 100644 index 73e3b5f7..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/fragile.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#unicopia:glass_blocks", - "#unicopia:glass_panes", - "minecraft:vine", - "minecraft:lily_pad" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json b/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json deleted file mode 100644 index 0c79fc76..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/glass_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:glass_blocks" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/glass_panes.json b/src/main/resources/data/unicopia/tags/blocks/glass_panes.json deleted file mode 100644 index 7c6b6dd9..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/glass_panes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:glass_panes" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/interesting.json b/src/main/resources/data/unicopia/tags/blocks/interesting.json deleted file mode 100644 index 4662a940..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/interesting.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:sea_lantern", - "minecraft:ender_chest", - "minecraft:end_portal_frame", - "minecraft:jukebox", - "minecraft:spawner", - "#c:ores" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/kicks_up_dust.json b/src/main/resources/data/unicopia/tags/blocks/kicks_up_dust.json deleted file mode 100644 index 5a3a6783..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/kicks_up_dust.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:sand", - "minecraft:gravel", - "minecraft:suspicious_gravel", - "#c:concrete_powders" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/palm_logs.json b/src/main/resources/data/unicopia/tags/blocks/palm_logs.json deleted file mode 100644 index 38397972..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/palm_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood" - ] -} diff --git a/src/main/resources/data/unicopia/tags/blocks/unaffected_by_grow_ability.json b/src/main/resources/data/unicopia/tags/blocks/unaffected_by_grow_ability.json deleted file mode 100644 index 06c918c6..00000000 --- a/src/main/resources/data/unicopia/tags/blocks/unaffected_by_grow_ability.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:grass_block" - ] -} From 672dd72d629adbf471b281bee23e8dc99de38bb8 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 20:46:29 +0000 Subject: [PATCH 33/44] Move a whole bunch of item tags to datagen --- .../unicopia/UConventionalTags.java | 38 ++++++ .../com/minelittlepony/unicopia/UTags.java | 29 ++++- .../unicopia/datagen/Datagen.java | 5 + .../datagen/providers/UBlockTagProvider.java | 50 ++++---- .../datagen/providers/UItemTagProvider.java | 117 +++++++++++++++++- .../unicopia/entity/player/PlayerPhysics.java | 5 +- .../unicopia/item/ZapAppleItem.java | 4 +- .../resources/data/c/tags/items/acorns.json | 6 - .../resources/data/c/tags/items/apples.json | 9 -- .../resources/data/c/tags/items/bananas.json | 6 - .../resources/data/c/tags/items/boats.json | 15 --- .../data/c/tags/items/cooked_fish.json | 8 -- .../resources/data/c/tags/items/fruits.json | 9 -- .../resources/data/c/tags/items/grain.json | 6 - .../resources/data/c/tags/items/mangoes.json | 6 - .../resources/data/c/tags/items/muffins.json | 6 - .../data/c/tags/items/mushrooms.json | 7 -- .../resources/data/c/tags/items/nuts.json | 6 - .../resources/data/c/tags/items/oatmeals.json | 6 - .../data/c/tags/items/pineapples.json | 6 - .../data/c/tags/items/pinecones.json | 6 - .../data/c/tags/items/rotten_meats.json | 3 +- .../resources/data/c/tags/items/seeds.json | 11 -- .../resources/data/c/tags/items/sticks.json | 6 - .../tags/items/cabbage_roll_ingredients.json | 8 -- .../tags/items/comfort_foods.json | 8 -- .../data/unicopia/tags/items/acorns.json | 6 - .../data/unicopia/tags/items/apple_seeds.json | 8 -- .../data/unicopia/tags/items/apples.json | 6 - .../data/unicopia/tags/items/badges.json | 13 -- .../data/unicopia/tags/items/baskets.json | 15 --- .../data/unicopia/tags/items/bed_sheets.json | 31 ----- .../data/unicopia/tags/items/can_cut_pie.json | 7 -- .../data/unicopia/tags/items/chitin.json | 12 -- .../data/unicopia/tags/items/cloud_beds.json | 6 - .../data/unicopia/tags/items/cloud_jars.json | 7 -- .../data/unicopia/tags/items/cloud_slabs.json | 10 -- .../unicopia/tags/items/cloud_stairs.json | 11 -- .../data/unicopia/tags/items/clouds.json | 13 -- .../unicopia/tags/items/cools_off_kirins.json | 9 -- .../unicopia/tags/items/falls_slowly.json | 8 -- .../unicopia/tags/items/floats_on_clouds.json | 12 -- .../unicopia/tags/items/fresh_apples.json | 9 -- .../unicopia/tags/items/has_no_traits.json | 21 ---- .../tags/items/is_delivered_aggressively.json | 6 - .../unicopia/tags/items/magic_feathers.json | 7 -- .../data/unicopia/tags/items/palm_logs.json | 9 -- .../data/unicopia/tags/items/pies.json | 7 -- .../tags/items/spooked_mob_drops.json | 6 - .../data/unicopia/tags/items/zap_logs.json | 9 -- 50 files changed, 216 insertions(+), 418 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/UConventionalTags.java delete mode 100644 src/main/resources/data/c/tags/items/acorns.json delete mode 100644 src/main/resources/data/c/tags/items/apples.json delete mode 100644 src/main/resources/data/c/tags/items/bananas.json delete mode 100644 src/main/resources/data/c/tags/items/boats.json delete mode 100644 src/main/resources/data/c/tags/items/cooked_fish.json delete mode 100644 src/main/resources/data/c/tags/items/fruits.json delete mode 100644 src/main/resources/data/c/tags/items/grain.json delete mode 100644 src/main/resources/data/c/tags/items/mangoes.json delete mode 100644 src/main/resources/data/c/tags/items/muffins.json delete mode 100644 src/main/resources/data/c/tags/items/mushrooms.json delete mode 100644 src/main/resources/data/c/tags/items/nuts.json delete mode 100644 src/main/resources/data/c/tags/items/oatmeals.json delete mode 100644 src/main/resources/data/c/tags/items/pineapples.json delete mode 100644 src/main/resources/data/c/tags/items/pinecones.json delete mode 100644 src/main/resources/data/c/tags/items/seeds.json delete mode 100644 src/main/resources/data/c/tags/items/sticks.json delete mode 100644 src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json delete mode 100644 src/main/resources/data/farmersdelight/tags/items/comfort_foods.json delete mode 100644 src/main/resources/data/unicopia/tags/items/acorns.json delete mode 100644 src/main/resources/data/unicopia/tags/items/apple_seeds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/apples.json delete mode 100644 src/main/resources/data/unicopia/tags/items/badges.json delete mode 100644 src/main/resources/data/unicopia/tags/items/baskets.json delete mode 100644 src/main/resources/data/unicopia/tags/items/bed_sheets.json delete mode 100644 src/main/resources/data/unicopia/tags/items/can_cut_pie.json delete mode 100644 src/main/resources/data/unicopia/tags/items/chitin.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_beds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_jars.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_slabs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cloud_stairs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/clouds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/cools_off_kirins.json delete mode 100644 src/main/resources/data/unicopia/tags/items/falls_slowly.json delete mode 100644 src/main/resources/data/unicopia/tags/items/floats_on_clouds.json delete mode 100644 src/main/resources/data/unicopia/tags/items/fresh_apples.json delete mode 100644 src/main/resources/data/unicopia/tags/items/has_no_traits.json delete mode 100644 src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json delete mode 100644 src/main/resources/data/unicopia/tags/items/magic_feathers.json delete mode 100644 src/main/resources/data/unicopia/tags/items/palm_logs.json delete mode 100644 src/main/resources/data/unicopia/tags/items/pies.json delete mode 100644 src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json delete mode 100644 src/main/resources/data/unicopia/tags/items/zap_logs.json diff --git a/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java b/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java new file mode 100644 index 00000000..e1a0a0b1 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/UConventionalTags.java @@ -0,0 +1,38 @@ +package com.minelittlepony.unicopia; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +public interface UConventionalTags { + TagKey APPLES = item("apples"); + TagKey ACORNS = item("acorns"); + TagKey PINECONES = item("pinecones"); + TagKey PINEAPPLES = item("pineapples"); + TagKey BANANAS = item("bananas"); + TagKey STICKS = item("sticks"); + TagKey SEEDS = item("seeds"); + TagKey GRAIN = item("grain"); + TagKey NUTS = item("nuts"); + TagKey MUSHROOMS = item("mushrooms"); + TagKey MUFFINS = item("muffins"); + TagKey MANGOES = item("mangoes"); + TagKey OEATMEALS = item("oatmeals"); + + TagKey FRUITS = item("fruits"); + + TagKey COOKED_FISH = item("cooked_fish"); + + TagKey CROPS_PEANUTS = item("crops/peanuts"); + TagKey TOOL_KNIVES = item("tools/knives"); + + static TagKey item(String name) { + return TagKey.of(RegistryKeys.ITEM, new Identifier("c", name)); + } + + static TagKey block(String name) { + return TagKey.of(RegistryKeys.BLOCK, new Identifier("c", name)); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index 2524d64a..b95d8350 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import net.minecraft.world.dimension.DimensionType; public interface UTags { - TagKey APPLES = item("apples"); TagKey FRESH_APPLES = item("fresh_apples"); TagKey FALLS_SLOWLY = item("falls_slowly"); @@ -34,11 +33,11 @@ public interface UTags { TagKey HORSE_SHOES = item("horse_shoes"); TagKey APPLE_SEEDS = item("apple_seeds"); - TagKey ACORNS = item("acorns"); TagKey BASKETS = item("baskets"); + TagKey BADGES = item("badges"); + TagKey BED_SHEETS = item("bed_sheets"); + TagKey CLOUD_JARS = item("cloud_jars"); - TagKey GLASS_PANES = block("glass_panes"); - TagKey GLASS_BLOCKS = block("glass_blocks"); TagKey FRAGILE = block("fragile"); TagKey INTERESTING = block("interesting"); TagKey CATAPULT_IMMUNE = block("catapult_immune"); @@ -59,6 +58,28 @@ public interface UTags { TagKey HAS_NO_ATMOSPHERE = dimension("has_no_atmosphere"); + interface Items { + TagKey ZAP_LOGS = item("zap_logs"); + TagKey WAXED_ZAP_LOGS = item("waxed_zap_logs"); + TagKey PALM_LOGS = item("palm_logs"); + TagKey CLOUD_BEDS = item("cloud_beds"); + TagKey CLOUD_SLABS = item("cloud_slabs"); + TagKey CLOUD_STAIRS = item("cloud_stairs"); + TagKey CLOUD_BLOCKS = item("cloud_blocks"); + TagKey CHITIN_BLOCKS = item("chitin_blocks"); + } + + interface Blocks { + TagKey ZAP_LOGS = block("zap_logs"); + TagKey WAXED_ZAP_LOGS = block("waxed_zap_logs"); + TagKey PALM_LOGS = block("palm_logs"); + TagKey CLOUD_BEDS = block("cloud_beds"); + TagKey CLOUD_SLABS = block("cloud_slabs"); + TagKey CLOUD_STAIRS = block("cloud_stairs"); + TagKey CLOUD_BLOCKS = block("cloud_blocks"); + TagKey CHITIN_BLOCKS = block("chitin_blocks"); + } + static TagKey item(String name) { return TagKey.of(RegistryKeys.ITEM, Unicopia.id(name)); } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java index 378a8d79..9cfcbe8b 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -1,5 +1,8 @@ package com.minelittlepony.unicopia.datagen; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import com.minelittlepony.unicopia.datagen.providers.UBlockTagProvider; import com.minelittlepony.unicopia.datagen.providers.UItemTagProvider; import com.minelittlepony.unicopia.datagen.providers.UModelProvider; @@ -19,6 +22,8 @@ import net.minecraft.world.gen.carver.ConfiguredCarver; import net.minecraft.world.gen.feature.PlacedFeature; public class Datagen implements DataGeneratorEntrypoint { + public static final Logger LOGGER = LogManager.getLogger(); + @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { final FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java index 5995a6d8..2deff29f 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java @@ -16,6 +16,7 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagBuilder; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -24,6 +25,11 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { super(output, registriesFuture); } + @Override + protected TagBuilder getTagBuilder(TagKey tag) { + return super.getTagBuilder(tag); + } + @Override protected void configure(WrapperLookup registries) { Block[] crops = { @@ -47,7 +53,6 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { addPalmWoodset(); addCloudBlocksets(); addChitinBlocksets(); - addHayBlocks(); addFruitTrees(); getOrCreateTagBuilder(UTags.CRYSTAL_HEART_BASE).add( @@ -107,13 +112,10 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { UBlocks.ZAP_STAIRS ); - TagKey logsTag = UTags.block("zap_logs"); - TagKey waxedLogsTag = UTags.block("waxed_zap_logs"); - - getOrCreateTagBuilder(logsTag).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); - getOrCreateTagBuilder(waxedLogsTag).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD); - getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag).forceAddTag(waxedLogsTag); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); + getOrCreateTagBuilder(UTags.Blocks.ZAP_LOGS).add(UBlocks.ZAP_LOG, UBlocks.ZAP_WOOD, UBlocks.STRIPPED_ZAP_LOG, UBlocks.STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(UTags.Blocks.WAXED_ZAP_LOGS).add(UBlocks.WAXED_ZAP_LOG, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_STRIPPED_ZAP_LOG, UBlocks.WAXED_STRIPPED_ZAP_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(UTags.Blocks.ZAP_LOGS).forceAddTag(UTags.Blocks.WAXED_ZAP_LOGS); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(UTags.Blocks.ZAP_LOGS); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.ZAP_PLANKS, UBlocks.WAXED_ZAP_PLANKS); //getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.ZAP_BUTTON); @@ -133,12 +135,9 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { private void addPalmWoodset() { getOrCreateTagBuilder(BlockTags.LEAVES).add(UBlocks.PALM_LEAVES); getOrCreateTagBuilder(BlockTags.HOE_MINEABLE).add(UBlocks.PALM_LEAVES); - - TagKey logsTag = UTags.block("palm_logs"); - - getOrCreateTagBuilder(logsTag).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); - getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(logsTag); - getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(logsTag); + getOrCreateTagBuilder(UTags.Blocks.PALM_LOGS).add(UBlocks.PALM_LOG, UBlocks.PALM_WOOD, UBlocks.STRIPPED_PALM_LOG, UBlocks.STRIPPED_PALM_WOOD); + getOrCreateTagBuilder(BlockTags.LOGS).forceAddTag(UTags.Blocks.PALM_LOGS); + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN).forceAddTag(UTags.Blocks.PALM_LOGS); getOrCreateTagBuilder(BlockTags.PLANKS).add(UBlocks.PALM_PLANKS); addSign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); getOrCreateTagBuilder(BlockTags.WOODEN_BUTTONS).add(UBlocks.PALM_BUTTON); @@ -163,24 +162,31 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_PLANK_STAIRS, UBlocks.COMPACTED_CLOUD_PLANKS ); - getOrCreateTagBuilder(UTags.block("cloud_beds")).add(UBlocks.CLOUD_BED); - getOrCreateTagBuilder(UTags.block("cloud_slabs")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_BEDS).add(UBlocks.CLOUD_BED); + getOrCreateTagBuilder(UTags.Blocks.CLOUD_SLABS).add( UBlocks.CLOUD_SLAB, UBlocks.SOGGY_CLOUD_SLAB, UBlocks.DENSE_CLOUD_SLAB, UBlocks.ETCHED_CLOUD_SLAB, UBlocks.CLOUD_PLANK_SLAB, UBlocks.CLOUD_BRICK_SLAB ); - getOrCreateTagBuilder(UTags.block("cloud_stairs")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_STAIRS).add( UBlocks.CLOUD_STAIRS, UBlocks.SOGGY_CLOUD_STAIRS, UBlocks.DENSE_CLOUD_STAIRS, UBlocks.ETCHED_CLOUD_STAIRS, UBlocks.CLOUD_PLANK_STAIRS, UBlocks.CLOUD_BRICK_STAIRS ); - getOrCreateTagBuilder(UTags.block("clouds")).add( + getOrCreateTagBuilder(UTags.Blocks.CLOUD_BLOCKS).add( UBlocks.CLOUD, UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_BRICKS, UBlocks.DENSE_CLOUD, - UBlocks.ETCHED_CLOUD, UBlocks.CARVED_CLOUD, + UBlocks.ETCHED_CLOUD, UBlocks.CARVED_CLOUD, UBlocks.CLOUD_PILLAR, UBlocks.COMPACTED_CLOUD, UBlocks.COMPACTED_CLOUD_PLANKS, UBlocks.COMPACTED_CLOUD_BRICKS, - UBlocks.UNSTABLE_CLOUD, UBlocks.SOGGY_CLOUD + UBlocks.UNSTABLE_CLOUD, UBlocks.SOGGY_CLOUD, UBlocks.SHAPING_BENCH ); } private void addChitinBlocksets() { + getOrCreateTagBuilder(UTags.Blocks.CHITIN_BLOCKS).add( + UBlocks.CHITIN, UBlocks.SURFACE_CHITIN, + UBlocks.CHISELLED_CHITIN, UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CHISELLED_CHITIN_STAIRS, + UBlocks.CHITIN_SPIKES + ); + + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE).add( UBlocks.CHITIN_SPIKES, UBlocks.CHISELLED_CHITIN, UBlocks.CHISELLED_CHITIN_HULL, UBlocks.CHISELLED_CHITIN_SLAB, UBlocks.CHISELLED_CHITIN_STAIRS @@ -195,8 +201,4 @@ public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider { getOrCreateTagBuilder(BlockTags.CEILING_HANGING_SIGNS).add(hanging); getOrCreateTagBuilder(BlockTags.WALL_HANGING_SIGNS).add(wallHanging); } - - private void addHayBlocks() { - - } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java index 22104b6a..72b6e5a7 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java @@ -1,26 +1,57 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.Objects; import java.util.concurrent.CompletableFuture; +import com.minelittlepony.unicopia.Race; +import com.minelittlepony.unicopia.UConventionalTags; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.Datagen; +import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.RegistryWrapper.WrapperLookup; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagBuilder; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { - public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, BlockTagProvider blockTagProvider) { + private final UBlockTagProvider blockTagProvider; + + public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, UBlockTagProvider blockTagProvider) { super(output, registriesFuture, blockTagProvider); + this.blockTagProvider = blockTagProvider; + } + + @Override + public void copy(TagKey blockTag, TagKey itemTag) { + TagBuilder blockTagBuilder = Objects.requireNonNull(blockTagProvider, "Pass Block tag provider via constructor to use copy").getTagBuilder(blockTag); + TagBuilder itemTagBuilder = getTagBuilder(itemTag); + blockTagBuilder.build().forEach(entry -> { + if (entry.canAdd(Registries.ITEM::containsId, tagId -> getTagBuilder(TagKey.of(RegistryKeys.ITEM, tagId)) != null)) { + itemTagBuilder.add(entry); + } else { + Datagen.LOGGER.warn("Cannot copy missing entry {} to item tag {}", entry, itemTag.id()); + } + }); } @Override protected void configure(WrapperLookup arg) { copyBlockTags(); + exportConventionalTags(); getOrCreateTagBuilder(ItemTags.BOOKSHELF_BOOKS).add(UItems.SPELLBOOK); getOrCreateTagBuilder(ItemTags.BEDS).add(UItems.CLOTH_BED, UItems.CLOUD_BED); @@ -36,6 +67,44 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(UTags.POLEARMS).add(UItems.WOODEN_POLEARM, UItems.STONE_POLEARM, UItems.IRON_POLEARM, UItems.GOLDEN_POLEARM, UItems.DIAMOND_POLEARM, UItems.NETHERITE_POLEARM); getOrCreateTagBuilder(ItemTags.TOOLS).addTag(UTags.HORSE_SHOES).addTag(UTags.POLEARMS); + + getOrCreateTagBuilder(UTags.BASKETS).add( + UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, UItems.DARK_OAK_BASKET, + UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.PALM_BASKET, UItems.SPRUCE_BASKET + ); + getOrCreateTagBuilder(UTags.BADGES).add(Race.REGISTRY.stream() + .map(race -> race.getId().withPath(p -> p + "_badge")) + .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) + .toArray(Item[]::new)); + getOrCreateTagBuilder(UTags.BED_SHEETS).add(BedsheetsItem.ITEMS.values().stream().toArray(Item[]::new)); + getOrCreateTagBuilder(UTags.APPLE_SEEDS).add(UItems.GREEN_APPLE_SEEDS, UItems.SWEET_APPLE_SEEDS, UItems.SOUR_APPLE_SEEDS); + getOrCreateTagBuilder(UTags.MAGIC_FEATHERS).add(UItems.PEGASUS_FEATHER, UItems.GRYPHON_FEATHER); + getOrCreateTagBuilder(UTags.FRESH_APPLES).add(Items.APPLE, UItems.GREEN_APPLE, UItems.SWEET_APPLE, UItems.SOUR_APPLE); + getOrCreateTagBuilder(UTags.CLOUD_JARS).add(UItems.RAIN_CLOUD_JAR, UItems.STORM_CLOUD_JAR); + getOrCreateTagBuilder(UTags.PIES).add(UItems.APPLE_PIE, UItems.APPLE_PIE_HOOF); + + // technical tags + getOrCreateTagBuilder(ItemTags.VILLAGER_PLANTABLE_SEEDS).addTag(UTags.APPLE_SEEDS); + getOrCreateTagBuilder(UTags.CAN_CUT_PIE).forceAddTag(ConventionalItemTags.SHEARS).addOptionalTag(UConventionalTags.TOOL_KNIVES); + getOrCreateTagBuilder(UTags.COOLS_OFF_KIRINS).add(Items.MELON_SLICE, UItems.JUICE).forceAddTag(ConventionalItemTags.WATER_BUCKETS); + getOrCreateTagBuilder(UTags.FALLS_SLOWLY).add(Items.FEATHER, UItems.CLOUD_LUMP).forceAddTag(UTags.MAGIC_FEATHERS); + getOrCreateTagBuilder(UTags.IS_DELIVERED_AGGRESSIVELY).forceAddTag(ItemTags.ANVIL); + getOrCreateTagBuilder(UTags.SPOOKED_MOB_DROPS).add(Items.BRICK); + getOrCreateTagBuilder(UTags.FLOATS_ON_CLOUDS) + .forceAddTag(UTags.Items.CLOUD_BEDS) + .forceAddTag(UTags.Items.CLOUD_SLABS) + .forceAddTag(UTags.Items.CLOUD_STAIRS) + .forceAddTag(UTags.Items.CLOUD_BLOCKS) + .add(UItems.CLOUD_LUMP); + getOrCreateTagBuilder(UTags.HAS_NO_TRAITS).add( + Items.AIR, Items.SPAWNER, Items.STRUCTURE_VOID, Items.STRUCTURE_BLOCK, + Items.COMMAND_BLOCK, Items.CHAIN_COMMAND_BLOCK, Items.REPEATING_COMMAND_BLOCK, + Items.LIGHT, Items.JIGSAW, Items.BARRIER, Items.BEDROCK, Items.END_PORTAL_FRAME, + Items.DEBUG_STICK, Items.COMMAND_BLOCK_MINECART, + UItems.PLUNDER_VINE + ).forceAddTag(UTags.BADGES); + + exportFarmersDelightItems(); } private void copyBlockTags() { @@ -55,5 +124,51 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { copy(BlockTags.TRAPDOORS, ItemTags.TRAPDOORS); copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS); + + copy(UTags.Blocks.ZAP_LOGS, UTags.Items.ZAP_LOGS); + copy(UTags.Blocks.WAXED_ZAP_LOGS, UTags.Items.WAXED_ZAP_LOGS); + copy(UTags.Blocks.PALM_LOGS, UTags.Items.PALM_LOGS); + copy(UTags.Blocks.CLOUD_BEDS, UTags.Items.CLOUD_BEDS); + copy(UTags.Blocks.CLOUD_SLABS, UTags.Items.CLOUD_SLABS); + copy(UTags.Blocks.CLOUD_STAIRS, UTags.Items.CLOUD_STAIRS); + copy(UTags.Blocks.CLOUD_BLOCKS, UTags.Items.CLOUD_BLOCKS); + copy(UTags.Blocks.CHITIN_BLOCKS, UTags.Items.CHITIN_BLOCKS); + } + + private void exportConventionalTags() { + getOrCreateTagBuilder(UConventionalTags.ACORNS).add(UItems.ACORN); + getOrCreateTagBuilder(UConventionalTags.APPLES) + .add(Items.APPLE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, UItems.ROTTEN_APPLE) + .forceAddTag(UTags.FRESH_APPLES) + .addOptionalTag(new Identifier("c", "pyrite_apples")) // no idea which mod add pyrite apples + ; + getOrCreateTagBuilder(UConventionalTags.BANANAS).add(UItems.BANANA); + getOrCreateTagBuilder(UConventionalTags.COOKED_FISH).add(Items.COOKED_COD, Items.COOKED_SALMON); + getOrCreateTagBuilder(UConventionalTags.STICKS).add(Items.STICK); + getOrCreateTagBuilder(UConventionalTags.PINECONES).add(UItems.PINECONE); + getOrCreateTagBuilder(UConventionalTags.PINEAPPLES).add(UItems.PINEAPPLE); + getOrCreateTagBuilder(UConventionalTags.MANGOES).add(UItems.MANGO); + getOrCreateTagBuilder(UConventionalTags.MUSHROOMS).add(Items.RED_MUSHROOM, Items.BROWN_MUSHROOM); + getOrCreateTagBuilder(UConventionalTags.MUFFINS).add(UItems.MUFFIN); + getOrCreateTagBuilder(UConventionalTags.SEEDS).add(Items.BEETROOT_SEEDS, Items.MELON_SEEDS, Items.PUMPKIN_SEEDS, Items.TORCHFLOWER_SEEDS, Items.WHEAT_SEEDS) + .add(UItems.OAT_SEEDS) + .forceAddTag(UTags.APPLE_SEEDS); + getOrCreateTagBuilder(UConventionalTags.OEATMEALS).add(UItems.OATMEAL); + getOrCreateTagBuilder(UConventionalTags.GRAIN).add(Items.WHEAT, UItems.OATS); + getOrCreateTagBuilder(UConventionalTags.NUTS).addOptionalTag(UConventionalTags.CROPS_PEANUTS); + + getOrCreateTagBuilder(UConventionalTags.FRUITS) + .forceAddTag(UConventionalTags.MANGOES) + .forceAddTag(UConventionalTags.PINEAPPLES) + .forceAddTag(UConventionalTags.APPLES) + .forceAddTag(UConventionalTags.BANANAS); + } + + private void exportFarmersDelightItems() { + getOrCreateTagBuilder(UTags.COOLS_OFF_KIRINS) + .addOptional(new Identifier("farmersdelight:melon_popsicle")) + .addOptional(new Identifier("farmersdelight:melon_juice")); + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("farmersdelight:cabbage_roll_ingredients"))).add(UItems.OATS, UItems.ROCK, UItems.WHEAT_WORMS); + getOrCreateTagBuilder(TagKey.of(RegistryKeys.ITEM, new Identifier("farmersdelight:comfort_foods"))).add(UItems.OATMEAL, UItems.ROCK_STEW, UItems.MUFFIN); } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java index 6005489a..a857cc73 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -29,6 +29,7 @@ import com.minelittlepony.unicopia.server.world.UGameRules; import com.minelittlepony.unicopia.server.world.WeatherConditions; import com.minelittlepony.unicopia.util.*; +import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBlockTags; import net.minecraft.block.*; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityPose; @@ -759,9 +760,9 @@ public class PlayerPhysics extends EntityPhysics implements Tickab entity.addVelocity(orientation.x, orientation.y, orientation.z); boolean isEarthPonySmash = pony.getObservedSpecies().canUseEarth() && !isFlying(); - int damage = TraceHelper.findBlocks(entity, speed + 4, 1, state -> (isEarthPonySmash && !state.isAir()) || state.isIn(UTags.GLASS_PANES)).stream() + int damage = TraceHelper.findBlocks(entity, speed + 4, 1, state -> (isEarthPonySmash && !state.isAir()) || state.isIn(ConventionalBlockTags.GLASS_PANES)).stream() .flatMap(pos -> BlockPos.streamOutwards(pos, 2, 2, 2)) - .filter(pos -> (isEarthPonySmash && !entity.getWorld().isAir(pos)) || entity.getWorld().getBlockState(pos).isIn(UTags.GLASS_PANES)) + .filter(pos -> (isEarthPonySmash && !entity.getWorld().isAir(pos)) || entity.getWorld().getBlockState(pos).isIn(ConventionalBlockTags.GLASS_PANES)) .reduce(0, (u, pos) -> { if (pony.canModifyAt(pos, ModificationType.PHYSICAL)) { if (isEarthPonySmash) { diff --git a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java index 711cbec8..63cfb026 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/ZapAppleItem.java @@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.item; import java.util.List; -import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.UConventionalTags; import com.minelittlepony.unicopia.Unicopia; import com.minelittlepony.unicopia.advancement.UCriteria; import com.minelittlepony.unicopia.entity.Living; @@ -103,7 +103,7 @@ public class ZapAppleItem extends Item implements ChameleonItem, MultiItem { public List getDefaultStacks() { return Unicopia.SIDE.getPony().map(Pony::asWorld) .stream() - .flatMap(world -> RegistryUtils.valuesForTag(world, UTags.APPLES)) + .flatMap(world -> RegistryUtils.valuesForTag(world, UConventionalTags.APPLES)) .filter(a -> a != this).map(item -> { ItemStack stack = new ItemStack(this); stack.getOrCreateNbt().putString("appearance", Registries.ITEM.getId(item).toString()); diff --git a/src/main/resources/data/c/tags/items/acorns.json b/src/main/resources/data/c/tags/items/acorns.json deleted file mode 100644 index c88adc74..00000000 --- a/src/main/resources/data/c/tags/items/acorns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:acorn" - ] -} diff --git a/src/main/resources/data/c/tags/items/apples.json b/src/main/resources/data/c/tags/items/apples.json deleted file mode 100644 index 2e326fee..00000000 --- a/src/main/resources/data/c/tags/items/apples.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:apple", - "minecraft:golden_apple", - { "id": "#c:pyrite_apples", "required": false }, - "#unicopia:fresh_apples" - ] -} diff --git a/src/main/resources/data/c/tags/items/bananas.json b/src/main/resources/data/c/tags/items/bananas.json deleted file mode 100644 index f2e0bcc6..00000000 --- a/src/main/resources/data/c/tags/items/bananas.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:banana" - ] -} diff --git a/src/main/resources/data/c/tags/items/boats.json b/src/main/resources/data/c/tags/items/boats.json deleted file mode 100644 index dde2408d..00000000 --- a/src/main/resources/data/c/tags/items/boats.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:oak_boat", - "minecraft:bamboo_raft", - "minecraft:spruce_boat", - "minecraft:birch_boat", - "minecraft:jungle_boat", - "minecraft:acacia_boat", - "minecraft:dark_oak_boat", - "minecraft:mangrove_boat", - "minecraft:cherry_boat", - "unicopia:palm_boat" - ] -} diff --git a/src/main/resources/data/c/tags/items/cooked_fish.json b/src/main/resources/data/c/tags/items/cooked_fish.json deleted file mode 100644 index 5027c0a3..00000000 --- a/src/main/resources/data/c/tags/items/cooked_fish.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cooked_cod", - "minecraft:cooked_salmon", - { "id": "#c:cooked_fishes", "required": false } - ] -} diff --git a/src/main/resources/data/c/tags/items/fruits.json b/src/main/resources/data/c/tags/items/fruits.json deleted file mode 100644 index 696b1906..00000000 --- a/src/main/resources/data/c/tags/items/fruits.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango", - "#c:pineapples", - "#c:apples", - "#c:bananas" - ] -} diff --git a/src/main/resources/data/c/tags/items/grain.json b/src/main/resources/data/c/tags/items/grain.json deleted file mode 100644 index e33c2c96..00000000 --- a/src/main/resources/data/c/tags/items/grain.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oats" - ] -} diff --git a/src/main/resources/data/c/tags/items/mangoes.json b/src/main/resources/data/c/tags/items/mangoes.json deleted file mode 100644 index 2f6d5efe..00000000 --- a/src/main/resources/data/c/tags/items/mangoes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:mango" - ] -} diff --git a/src/main/resources/data/c/tags/items/muffins.json b/src/main/resources/data/c/tags/items/muffins.json deleted file mode 100644 index 9b8b4a32..00000000 --- a/src/main/resources/data/c/tags/items/muffins.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:muffin" - ] -} diff --git a/src/main/resources/data/c/tags/items/mushrooms.json b/src/main/resources/data/c/tags/items/mushrooms.json deleted file mode 100644 index ea2bc32c..00000000 --- a/src/main/resources/data/c/tags/items/mushrooms.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:red_mushroom", - "minecraft:brown_mushroom" - ] -} diff --git a/src/main/resources/data/c/tags/items/nuts.json b/src/main/resources/data/c/tags/items/nuts.json deleted file mode 100644 index 7fb489da..00000000 --- a/src/main/resources/data/c/tags/items/nuts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - { "id": "#c:crops/peanuts", "require": false } - ] -} diff --git a/src/main/resources/data/c/tags/items/oatmeals.json b/src/main/resources/data/c/tags/items/oatmeals.json deleted file mode 100644 index 043eecbf..00000000 --- a/src/main/resources/data/c/tags/items/oatmeals.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oatmeal" - ] -} diff --git a/src/main/resources/data/c/tags/items/pineapples.json b/src/main/resources/data/c/tags/items/pineapples.json deleted file mode 100644 index 60c5a61e..00000000 --- a/src/main/resources/data/c/tags/items/pineapples.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pineapple" - ] -} diff --git a/src/main/resources/data/c/tags/items/pinecones.json b/src/main/resources/data/c/tags/items/pinecones.json deleted file mode 100644 index 36eac177..00000000 --- a/src/main/resources/data/c/tags/items/pinecones.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pinecone" - ] -} diff --git a/src/main/resources/data/c/tags/items/rotten_meats.json b/src/main/resources/data/c/tags/items/rotten_meats.json index 560ab8ee..3f3bc662 100644 --- a/src/main/resources/data/c/tags/items/rotten_meats.json +++ b/src/main/resources/data/c/tags/items/rotten_meats.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "minecraft:rotten_flesh", - { "id": "c:rotten_meat", "required": false } + "minecraft:rotten_flesh" ] } diff --git a/src/main/resources/data/c/tags/items/seeds.json b/src/main/resources/data/c/tags/items/seeds.json deleted file mode 100644 index d61f66fb..00000000 --- a/src/main/resources/data/c/tags/items/seeds.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:pumpkin_seeds", - "minecraft:melon_seeds", - "unicopia:oat_seeds", - "unicopia:green_apple_seeds", - "unicopia:sweet_apple_seeds", - "unicopia:sour_apple_seeds" - ] -} diff --git a/src/main/resources/data/c/tags/items/sticks.json b/src/main/resources/data/c/tags/items/sticks.json deleted file mode 100644 index 90f5f079..00000000 --- a/src/main/resources/data/c/tags/items/sticks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:stick" - ] -} diff --git a/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json b/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json deleted file mode 100644 index 5324cab8..00000000 --- a/src/main/resources/data/farmersdelight/tags/items/cabbage_roll_ingredients.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oats", - "unicopia:rock", - "unicopia:wheat_worms" - ] -} diff --git a/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json b/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json deleted file mode 100644 index 00184e6a..00000000 --- a/src/main/resources/data/farmersdelight/tags/items/comfort_foods.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oatmeal", - "unicopia:rock_stew", - "unicopia:muffin" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/acorns.json b/src/main/resources/data/unicopia/tags/items/acorns.json deleted file mode 100644 index 64e40b98..00000000 --- a/src/main/resources/data/unicopia/tags/items/acorns.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:acorns" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/apple_seeds.json b/src/main/resources/data/unicopia/tags/items/apple_seeds.json deleted file mode 100644 index 7ed8c23a..00000000 --- a/src/main/resources/data/unicopia/tags/items/apple_seeds.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:green_apple_seeds", - "unicopia:sweet_apple_seeds", - "unicopia:sour_apple_seeds" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/apples.json b/src/main/resources/data/unicopia/tags/items/apples.json deleted file mode 100644 index 7a54d955..00000000 --- a/src/main/resources/data/unicopia/tags/items/apples.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:apples" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/badges.json b/src/main/resources/data/unicopia/tags/items/badges.json deleted file mode 100644 index 16481fc4..00000000 --- a/src/main/resources/data/unicopia/tags/items/badges.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:earth_badge", - "unicopia:unicorn_badge", - "unicopia:pegasus_badge", - "unicopia:changeling_badge", - "unicopia:bat_badge", - "unicopia:kirin_badge", - "unicopia:alicorn_badge", - "unicopia:hippogriff_badge" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/baskets.json b/src/main/resources/data/unicopia/tags/items/baskets.json deleted file mode 100644 index 41231c85..00000000 --- a/src/main/resources/data/unicopia/tags/items/baskets.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:oak_basket", - "unicopia:spruce_basket", - "unicopia:birch_basket", - "unicopia:jungle_basket", - "unicopia:acacia_basket", - "unicopia:cherry_basket", - "unicopia:dark_oak_basket", - "unicopia:mangrove_basket", - "unicopia:bamboo_basket", - "unicopia:palm_basket" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/bed_sheets.json b/src/main/resources/data/unicopia/tags/items/bed_sheets.json deleted file mode 100644 index 295c3f4d..00000000 --- a/src/main/resources/data/unicopia/tags/items/bed_sheets.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:light_gray_bed_sheets", - "unicopia:gray_bed_sheets", - "unicopia:black_bed_sheets", - "unicopia:brown_bed_sheets", - "unicopia:red_bed_sheets", - "unicopia:orange_bed_sheets", - "unicopia:yellow_bed_sheets", - "unicopia:lime_bed_sheets", - "unicopia:green_bed_sheets", - "unicopia:cyan_bed_sheets", - "unicopia:light_blue_bed_sheets", - "unicopia:blue_bed_sheets", - "unicopia:purple_bed_sheets", - "unicopia:magenta_bed_sheets", - "unicopia:pink_bed_sheets", - - - "unicopia:apple_bed_sheets", - "unicopia:barred_bed_sheets", - "unicopia:checkered_bed_sheets", - "unicopia:kelp_bed_sheets", - "unicopia:rainbow_bed_sheets", - "unicopia:rainbow_bpw_bed_sheets", - "unicopia:rainbow_bpy_bed_sheets", - "unicopia:rainbow_pbg_bed_sheets", - "unicopia:rainbow_pwr_bed_sheets" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/can_cut_pie.json b/src/main/resources/data/unicopia/tags/items/can_cut_pie.json deleted file mode 100644 index 588dbe99..00000000 --- a/src/main/resources/data/unicopia/tags/items/can_cut_pie.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#c:shears", - { "id": "#c:tools/knives", "required": false } - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/chitin.json b/src/main/resources/data/unicopia/tags/items/chitin.json deleted file mode 100644 index aff5bfad..00000000 --- a/src/main/resources/data/unicopia/tags/items/chitin.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:chitin", - "unicopia:surface_chitin", - "unicopia:chiselled_chitin", - "unicopia:chiselled_chitin_slab", - "unicopia:chiselled_chitin_stairs", - "unicopia:chiselled_chitin_hull", - "unicopia:chitin_spikes" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_beds.json b/src/main/resources/data/unicopia/tags/items/cloud_beds.json deleted file mode 100644 index 4338e8fd..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_beds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_bed" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_jars.json b/src/main/resources/data/unicopia/tags/items/cloud_jars.json deleted file mode 100644 index 3dad874d..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_jars.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:rain_cloud_jar", - "unicopia:storm_cloud_jar" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_slabs.json b/src/main/resources/data/unicopia/tags/items/cloud_slabs.json deleted file mode 100644 index d17c86ae..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_slabs.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_slab", - "unicopia:dense_cloud_slab", - "unicopia:cloud_brick_slab", - "unicopia:etched_cloud_slab", - "unicopia:cloud_plank_slab" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cloud_stairs.json b/src/main/resources/data/unicopia/tags/items/cloud_stairs.json deleted file mode 100644 index 49b0d346..00000000 --- a/src/main/resources/data/unicopia/tags/items/cloud_stairs.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_stairs", - "unicopia:dense_cloud_stairs", - "unicopia:cloud_brick_stairs", - "unicopia:etched_cloud_stairs", - "unicopia:cloud_plank_stairs", - "unicopia:cloud_chest" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/clouds.json b/src/main/resources/data/unicopia/tags/items/clouds.json deleted file mode 100644 index 7fe9a915..00000000 --- a/src/main/resources/data/unicopia/tags/items/clouds.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:cloud_lump", - "unicopia:cloud", - "unicopia:cloud_planks", - "unicopia:cloud_bricks", - "unicopia:dense_cloud", - "unicopia:etched_cloud", - "unicopia:unstable_cloud", - "unicopia:cloud_door" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json b/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json deleted file mode 100644 index 15e752ad..00000000 --- a/src/main/resources/data/unicopia/tags/items/cools_off_kirins.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:melon_slice", - "unicopia:juice", - { "id": "farmersdelight:melon_popsicle", "required": false }, - { "id": "farmersdelight:melon_juice", "required": false } - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/falls_slowly.json b/src/main/resources/data/unicopia/tags/items/falls_slowly.json deleted file mode 100644 index 49ac7cee..00000000 --- a/src/main/resources/data/unicopia/tags/items/falls_slowly.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:feather", - "#unicopia:magic_feathers", - "unicopia:cloud_lump" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json b/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json deleted file mode 100644 index cc18beba..00000000 --- a/src/main/resources/data/unicopia/tags/items/floats_on_clouds.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "#unicopia:clouds", - "#unicopia:cloud_slabs", - "#unicopia:cloud_stairs", - "#unicopia:cloud_beds", - "unicopia:cloud_pillar", - "unicopia:carved_cloud", - "unicopia:shaping_bench" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/fresh_apples.json b/src/main/resources/data/unicopia/tags/items/fresh_apples.json deleted file mode 100644 index e693b8f9..00000000 --- a/src/main/resources/data/unicopia/tags/items/fresh_apples.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:apple", - "unicopia:green_apple", - "unicopia:sweet_apple", - "unicopia:sour_apple" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/has_no_traits.json b/src/main/resources/data/unicopia/tags/items/has_no_traits.json deleted file mode 100644 index 1a300515..00000000 --- a/src/main/resources/data/unicopia/tags/items/has_no_traits.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:air", - "minecraft:spawner", - "minecraft:structure_void", - "minecraft:structure_block", - "minecraft:command_block", - "minecraft:chain_command_block", - "minecraft:repeating_command_block", - "minecraft:light", - "minecraft:jigsaw", - "minecraft:barrier", - "minecraft:bedrock", - "minecraft:end_portal_frame", - "minecraft:debug_stick", - "minecraft:command_block_minecart", - "unicopia:plunder_vine", - "#unicopia:badges" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json b/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json deleted file mode 100644 index 22543754..00000000 --- a/src/main/resources/data/unicopia/tags/items/is_delivered_aggressively.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#minecraft:anvil" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/magic_feathers.json b/src/main/resources/data/unicopia/tags/items/magic_feathers.json deleted file mode 100644 index d1af83d6..00000000 --- a/src/main/resources/data/unicopia/tags/items/magic_feathers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:pegasus_feather", - "unicopia:gryphon_feather" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/palm_logs.json b/src/main/resources/data/unicopia/tags/items/palm_logs.json deleted file mode 100644 index 38397972..00000000 --- a/src/main/resources/data/unicopia/tags/items/palm_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:palm_log", - "unicopia:palm_wood", - "unicopia:stripped_palm_log", - "unicopia:stripped_palm_wood" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/pies.json b/src/main/resources/data/unicopia/tags/items/pies.json deleted file mode 100644 index 995f7d85..00000000 --- a/src/main/resources/data/unicopia/tags/items/pies.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:apple_pie", - "unicopia:apple_pie_hoof" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json b/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json deleted file mode 100644 index 5bca236a..00000000 --- a/src/main/resources/data/unicopia/tags/items/spooked_mob_drops.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brick" - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/zap_logs.json b/src/main/resources/data/unicopia/tags/items/zap_logs.json deleted file mode 100644 index 37a121dc..00000000 --- a/src/main/resources/data/unicopia/tags/items/zap_logs.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "unicopia:zap_log", - "unicopia:zap_wood", - "unicopia:stripped_zap_log", - "unicopia:stripped_zap_wood" - ] -} From ffc66293fdca16b2f0a30adec652f79098e19b70 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 22:25:06 +0000 Subject: [PATCH 34/44] Fix fruit and nuts and seeds tags --- .../data/unicopia/tags/items/food_types/fruit.json | 2 +- .../data/unicopia/tags/items/food_types/nuts_and_seeds.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/data/unicopia/tags/items/food_types/fruit.json b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json index 4421c2ff..39c40cdc 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/fruit.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json @@ -14,6 +14,6 @@ { "id": "farmersdelight:tomato", "required": false }, { "id": "farmersdelight:melon_juice", "required": false }, { "id": "farmersdelight:fruit_salad", "required": false }, - { "id": "#garnished:berries", "require": false } + { "id": "#garnished:berries", "required": false } ] } diff --git a/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json b/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json index 20042716..937e7578 100644 --- a/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json +++ b/src/main/resources/data/unicopia/tags/items/food_types/nuts_and_seeds.json @@ -4,8 +4,8 @@ "#c:seeds", "#c:acorns", "#c:nuts", - { "id": "#garnished:nuts", "require": false }, - { "id": "#garnished:nut_mix", "require": false }, - { "id": "#garnished:neverable_delecacies", "require": false } + { "id": "#garnished:nuts", "required": false }, + { "id": "#garnished:nut_mix", "required": false }, + { "id": "#garnished:neverable_delecacies", "required": false } ] } From 1922c02f5bf21fc3589d72c0f63d8df84f0f7e8a Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 22:25:29 +0000 Subject: [PATCH 35/44] Fix incorrectly-generated seasons models --- .../unicopia/datagen/DataCollector.java | 38 +++++++++++++++++++ .../providers/SeasonsModelGenerator.java | 25 ++++++++++-- .../providers/UBlockStateModelGenerator.java | 9 ----- .../datagen/providers/UModelProvider.java | 17 ++++++++- 4 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/DataCollector.java diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/DataCollector.java b/src/main/java/com/minelittlepony/unicopia/datagen/DataCollector.java new file mode 100644 index 00000000..46b27642 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/DataCollector.java @@ -0,0 +1,38 @@ +package com.minelittlepony.unicopia.datagen; + +import java.util.HashMap; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; +import java.util.function.Supplier; + +import com.google.common.base.Preconditions; +import com.google.gson.JsonElement; + +import net.minecraft.data.DataOutput.PathResolver; +import net.minecraft.data.DataProvider; +import net.minecraft.data.DataWriter; +import net.minecraft.util.Identifier; + +public class DataCollector { + private final HashMap> values = new HashMap<>(); + + private final PathResolver resolver; + + public DataCollector(PathResolver resolver) { + this.resolver = resolver; + } + + public BiConsumer> prime() { + values.clear(); + return (Identifier id, Supplier value) -> + Preconditions.checkState(values.put(id, value) == null, "Duplicate model definition for " + id); + } + + public CompletableFuture upload(DataWriter cache) { + return CompletableFuture.allOf(values.entrySet() + .stream() + .map(entry -> DataProvider.writeToPath(cache, entry.getValue().get(), resolver.resolveJson(entry.getKey()))) + .toArray(CompletableFuture[]::new) + ); + } +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java index d1adf6a1..5b5474bc 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java @@ -1,17 +1,24 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.function.BiConsumer; +import java.util.function.Supplier; + +import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.item.UItems; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.util.Identifier; -class SeasonsModelGenerator { +public class SeasonsModelGenerator extends UBlockStateModelGenerator { + private static final String[] SEASONS = { "fall", "summer", "winter" }; - static UBlockStateModelGenerator create(BlockStateModelGenerator modelGenerator) { - return new UBlockStateModelGenerator(modelGenerator.blockStateCollector, (id, jsonSupplier) -> { + public SeasonsModelGenerator(BlockStateModelGenerator modelGenerator, BiConsumer> seasonsModelConsumer) { + super(modelGenerator.blockStateCollector, (id, jsonSupplier) -> { modelGenerator.modelCollector.accept(id, jsonSupplier); - modelGenerator.modelCollector.accept(id.withPrefixedPath("seasons/"), () -> { + seasonsModelConsumer.accept(id, () -> { JsonObject textures = jsonSupplier.get().getAsJsonObject().getAsJsonObject("textures"); JsonObject seasonTextures = new JsonObject(); for (String season : SEASONS) { @@ -31,4 +38,14 @@ class SeasonsModelGenerator { }); return textures; } + + @Override + public void register() { + registerWithStages(UBlocks.OATS, UBlocks.OATS.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + registerWithStages(UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6); + registerWithStages(UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), BlockModels.CROP, 0, 1); + + registerItemModel(UItems.OATS); + registerItemModel(UItems.OAT_SEEDS); + } } diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index e31252fb..eaceb1c5 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -16,7 +16,6 @@ import com.minelittlepony.unicopia.block.ShellsBlock; import com.minelittlepony.unicopia.block.SlimePustuleBlock; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; -import com.minelittlepony.unicopia.item.UItems; import com.minelittlepony.unicopia.server.world.Tree; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; @@ -81,8 +80,6 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { @Override public void register() { - UBlockStateModelGenerator seasonsModelGenerator = SeasonsModelGenerator.create(this); - for (int i = 0; i < Models.STEM_GROWTH_STAGES.length; i++) { Models.STEM_GROWTH_STAGES[i].upload(Unicopia.id("block/apple_sprout_stage" + i), TextureMap.stem(Blocks.MELON_STEM), modelCollector); } @@ -161,12 +158,6 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { Tree.REGISTRY.stream().filter(tree -> tree.sapling().isPresent()).forEach(tree -> registerFlowerPotPlant(tree.sapling().get(), tree.pot().get(), TintType.NOT_TINTED)); registerTintableCross(UBlocks.CURING_JOKE, TintType.NOT_TINTED); registerWithStages(UBlocks.GOLD_ROOT, Properties.AGE_7, BlockModels.CROP, 0, 0, 1, 1, 2, 2, 2, 3); - seasonsModelGenerator.registerWithStages(UBlocks.OATS, UBlocks.OATS.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); - seasonsModelGenerator.registerWithStages(UBlocks.OATS_STEM, UBlocks.OATS_STEM.getAgeProperty(), BlockModels.CROP, 0, 1, 2, 3, 4, 5, 6); - seasonsModelGenerator.registerWithStages(UBlocks.OATS_CROWN, UBlocks.OATS_CROWN.getAgeProperty(), BlockModels.CROP, 0, 1); - - seasonsModelGenerator.registerItemModel(UItems.OATS); - seasonsModelGenerator.registerItemModel(UItems.OAT_SEEDS); registerTallCrop(UBlocks.PINEAPPLE, Properties.AGE_7, Properties.BLOCK_HALF, new int[] { 0, 1, 2, 3, 4, 5, 5, 6 }, diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java index 2d82fdff..64bbc4be 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java @@ -2,14 +2,17 @@ package com.minelittlepony.unicopia.datagen.providers; import java.util.List; import java.util.Map; - +import java.util.concurrent.CompletableFuture; import com.minelittlepony.unicopia.Race; import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.DataCollector; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; +import net.minecraft.data.DataOutput; +import net.minecraft.data.DataWriter; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.item.Item; import net.minecraft.item.Items; @@ -29,13 +32,25 @@ public class UModelProvider extends FabricModelProvider { UBlocks.ZAP_BULB, UItems.ZAP_BULB ); + private final DataCollector seasonsModels; + public UModelProvider(FabricDataOutput output) { super(output); + seasonsModels = new DataCollector(output.getResolver(DataOutput.OutputType.RESOURCE_PACK, "seasons/models")); } @Override public void generateBlockStateModels(BlockStateModelGenerator modelGenerator0) { UBlockStateModelGenerator.create(modelGenerator0).register(); + new SeasonsModelGenerator(modelGenerator0, seasonsModels.prime()).register(); + } + + @Override + public CompletableFuture run(DataWriter writer) { + return CompletableFuture.allOf( + super.run(writer), + seasonsModels.upload(writer) + ); } @Override From 095b10802ff0e24bcf6b0fc0997386e5fda06064 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 22:25:42 +0000 Subject: [PATCH 36/44] Update ad-astra integration --- .../unicopia/compat/ad_astra/OxygenUtils.java | 17 ++++-------- .../unicopia/entity/player/PlayerPhysics.java | 2 +- .../mixin/ad_astra/MixinOxygenUtils.java | 26 +++++++++++++------ 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java b/src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java index ca4956a4..d1497215 100644 --- a/src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/ad_astra/OxygenUtils.java @@ -1,18 +1,11 @@ package com.minelittlepony.unicopia.compat.ad_astra; -import com.minelittlepony.unicopia.mixin.ad_astra.MixinOxygenUtils; +import net.minecraft.entity.Entity; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.entity.LivingEntity; -import net.minecraft.world.World; +public final class OxygenUtils { + public static OxygenApi API = entity -> false; -public interface OxygenUtils { - boolean MOD_LOADED = FabricLoader.getInstance().isModLoaded("ad_astra"); - - static boolean entityHasOxygen(World world, LivingEntity entity) { - if (MOD_LOADED) { - return MixinOxygenUtils.entityHasOxygen(world, entity); - } - return false; + public interface OxygenApi { + boolean hasOxygen(Entity entity); } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java index a857cc73..81be2e28 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -196,7 +196,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab if ((RegistryUtils.isIn(entity.getWorld(), dimension, RegistryKeys.DIMENSION_TYPE, UTags.HAS_NO_ATMOSPHERE) || Unicopia.getConfig().dimensionsWithoutAtmosphere.get().contains(RegistryUtils.getId(entity.getWorld(), dimension, RegistryKeys.DIMENSION_TYPE).toString())) - && !OxygenUtils.entityHasOxygen(entity.getWorld(), entity)) { + && !OxygenUtils.API.hasOxygen(entity)) { return FlightType.NONE; } diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java b/src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java index be39ab53..c71bf32c 100644 --- a/src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java +++ b/src/main/java/com/minelittlepony/unicopia/mixin/ad_astra/MixinOxygenUtils.java @@ -1,20 +1,30 @@ package com.minelittlepony.unicopia.mixin.ad_astra; +import org.spongepowered.asm.mixin.Dynamic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; -import org.spongepowered.asm.mixin.gen.Invoker; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Coerce; +import org.spongepowered.asm.mixin.injection.Inject; -import net.minecraft.entity.LivingEntity; -import net.minecraft.world.World; +import com.minelittlepony.unicopia.compat.ad_astra.OxygenUtils; @Pseudo @Mixin( - targets = { "earth.terrarium.ad_astra.common.util.OxygenUtils" }, + targets = { "earth.terrarium.adastra.api.systems.OxygenApi" }, remap = false ) -public interface MixinOxygenUtils { - @Invoker("entityHasOxygen") - static boolean entityHasOxygen(World world, LivingEntity entity) { - return true; +public interface MixinOxygenUtils extends OxygenUtils.OxygenApi { + @Accessor("API") + @Coerce + static Object getAPI() { + throw new AbstractMethodError("stub"); + } + + @Dynamic("Compiler-generated class-init() method") + @Inject(method = "()V", at = @At("RETURN"), remap = false) + private static void classInit() { + OxygenUtils.API = (OxygenUtils.OxygenApi)getAPI(); } } From 1f2d6c04111ead42e781856727bfdbf26fbebd27 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 22:53:43 +0000 Subject: [PATCH 37/44] Fix flight when in inverted gravity. Closes #302 --- .../unicopia/entity/player/PlayerPhysics.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java index 81be2e28..35116ead 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java @@ -253,6 +253,10 @@ public class PlayerPhysics extends EntityPhysics implements Tickab final MutableVector velocity = new MutableVector(entity.getVelocity()); + if (isGravityNegative()) { + velocity.y *= -1; + } + if (isGravityNegative() && !entity.isSneaking() && entity.isInSneakingPose()) { float currentHeight = entity.getDimensions(entity.getPose()).height; float sneakingHeight = entity.getDimensions(EntityPose.STANDING).height; @@ -344,7 +348,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab } if (((LivingEntityDuck)entity).isJumping()) { - velocity.y -= 0.2F * getGravitySignum(); + velocity.y -= 0.2F; velocity.y /= 2F; } @@ -392,6 +396,10 @@ public class PlayerPhysics extends EntityPhysics implements Tickab velocity.z /= heavyness; } + if (isGravityNegative()) { + velocity.y *= -1; + } + entity.setVelocity(velocity.toImmutable()); if (isFlying() && !entity.isFallFlying() && !pony.getAcrobatics().isHanging() && pony.isClient()) { @@ -449,7 +457,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab } } - velocity.y -= 0.02 * getGravitySignum(); + velocity.y -= 0.02; velocity.x *= 0.9896; velocity.z *= 0.9896; } @@ -542,7 +550,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab boolean takeOffCondition = (horMotion > 0.05 || motion > 0.05) && pony.getJumpingHeuristic().hasChanged(Heuristic.TWICE); - boolean fallingTakeOffCondition = !entity.isOnGround() && velocity.y < -1.6 * getGravitySignum() && entity.fallDistance > 1; + boolean fallingTakeOffCondition = !entity.isOnGround() && velocity.y < -1.6 && entity.fallDistance > 1; if ((takeOffCondition || fallingTakeOffCondition) && !pony.getAcrobatics().isHanging() && !isCancelled) { initiateTakeoff(velocity); @@ -552,9 +560,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab private void initiateTakeoff(MutableVector velocity) { startFlying(false); - if (!isGravityNegative()) { - velocity.y += getHorizontalMotion() + 0.3; - } + velocity.y += getHorizontalMotion() + 0.3; applyThrust(velocity); velocity.x *= 0.2; @@ -636,6 +642,9 @@ public class PlayerPhysics extends EntityPhysics implements Tickab } else { float targetUpdraft = (float)WeatherConditions.getUpdraft(new BlockPos.Mutable().set(entity.getBlockPos()), entity.getWorld()) / 3F; targetUpdraft *= 1 + motion; + if (isGravityNegative()) { + targetUpdraft *= -1; + } this.updraft.update(targetUpdraft, targetUpdraft > this.updraft.getTarget() ? 30_000 : 3000); double updraft = this.updraft.getValue(); velocity.y += updraft; @@ -648,7 +657,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab descentRate *= 0.8F; } - velocity.y -= descentRate * getGravityModifier(); + velocity.y -= descentRate; } private void applyThrust(MutableVector velocity) { @@ -696,7 +705,7 @@ public class PlayerPhysics extends EntityPhysics implements Tickab } else { velocity.x += direction.x * 1.3F; velocity.z += direction.z * 1.3F; - velocity.y += ((direction.y * 2.45 + Math.abs(direction.y) * 10)) * getGravitySignum();// - heavyness / 5F + velocity.y += ((direction.y * 2.45 + Math.abs(direction.y) * 10));// - heavyness / 5F } if (velocity.y < 0 && hovering) { From cef8ef15ce039322ee99fd9909bcba66d9d2bc04 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 19 Mar 2024 22:57:31 +0000 Subject: [PATCH 38/44] Fixed players wearing the alicorn amulet getting the time change ability. #300 --- .../com/minelittlepony/unicopia/ability/TimeChangeAbility.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/TimeChangeAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/TimeChangeAbility.java index 198aee2f..a1e92a03 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/TimeChangeAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/TimeChangeAbility.java @@ -19,7 +19,7 @@ public class TimeChangeAbility implements Ability { @Override public boolean canUse(Race.Composite race) { - return Ability.super.canUse(race) || race.pseudo() == Race.UNICORN; + return canUse(race.physical()) || race.pseudo() == Race.UNICORN; } @Override From f7534f9f84c3a84643a4226fa669d7178d69bf3a Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 00:21:50 +0000 Subject: [PATCH 39/44] Fixed being able to equip amulets the the chest slot when trinkets is installed. #300 --- .../compat/trinkets/TrinketsDelegate.java | 2 +- .../compat/trinkets/UnicopiaTrinket.java | 15 ++++++++++++- .../unicopia/entity/ItemTracker.java | 22 ++++++++++++++----- .../unicopia/item/AlicornAmuletItem.java | 2 +- .../unicopia/item/AmuletItem.java | 2 +- .../unicopia/util/SoundEmitter.java | 7 +++++- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java index 6c896cf4..c9e17eb8 100644 --- a/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/TrinketsDelegate.java @@ -30,7 +30,7 @@ public interface TrinketsDelegate { TrinketsDelegate EMPTY = new TrinketsDelegate() {}; static TrinketsDelegate getInstance(@Nullable LivingEntity entity) { - if (!(entity instanceof PlayerEntity && hasTrinkets())) { + if (!hasTrinkets() || (entity != null && !(entity instanceof PlayerEntity))) { return EMPTY; } return TrinketsDelegateImpl.INSTANCE; diff --git a/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java index 5fad88d2..c8ce7e96 100644 --- a/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java +++ b/src/main/java/com/minelittlepony/unicopia/compat/trinkets/UnicopiaTrinket.java @@ -3,6 +3,8 @@ package com.minelittlepony.unicopia.compat.trinkets; import java.util.UUID; import com.google.common.collect.Multimap; +import com.minelittlepony.unicopia.entity.ItemTracker; +import com.minelittlepony.unicopia.entity.Living; import com.minelittlepony.unicopia.item.FriendshipBraceletItem; import com.minelittlepony.unicopia.item.WearableItem; @@ -30,8 +32,19 @@ public class UnicopiaTrinket implements Trinket { return; } + if (!(stack.getItem() instanceof ItemTracker.Trackable) && stack.getItem() instanceof Equipment q) { + entity.playSound(q.getEquipSound(), 1, 1); + } + } + + @Override + public void onUnequip(ItemStack stack, SlotReference slot, LivingEntity entity) { + if (stack.getItem() instanceof ItemTracker.Trackable t) { + Living l = Living.living(entity); + t.onUnequipped(l, l.getArmour().forceRemove(t)); + } if (stack.getItem() instanceof Equipment q) { - entity.playSound( q.getEquipSound(), 1, 1); + entity.playSound(q.getEquipSound(), 1, 1); } } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java index 5155a4cd..dbd889d1 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java @@ -4,6 +4,8 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; +import org.jetbrains.annotations.Nullable; + import com.minelittlepony.unicopia.compat.trinkets.TrinketsDelegate; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.util.*; @@ -33,6 +35,7 @@ public class ItemTracker implements NbtSerialisable, Copyable, Tick } private final Map items = new HashMap<>(); + private final Map forced = new HashMap<>(); public static Predicate wearing(Trackable charm, Predicate range) { return e -> Living.getOrEmpty(e) @@ -67,19 +70,23 @@ public class ItemTracker implements NbtSerialisable, Copyable, Tick @Override public void tick() { - update(living, living.getArmourStacks()); + update(living.getArmourStacks()); } - private void update(Living living, Stream stacks) { + private void update(Stream stacks) { final Set found = new HashSet<>(); final Set foundStacks = new HashSet<>(); + stacks.forEach(stack -> { if (stack.getItem() instanceof Trackable trackable) { - items.compute(trackable, (item, prev) -> prev == null ? 1 : prev + 1); + if (items.compute(trackable, (item, prev) -> prev == null ? 1 : prev + 1) == 1) { + trackable.onEquipped(this.living); + } found.add(trackable); foundStacks.add(stack); } }); + items.entrySet().removeIf(e -> { if (!found.contains(e.getKey())) { e.getKey().onUnequipped(living, e.getValue()); @@ -90,13 +97,16 @@ public class ItemTracker implements NbtSerialisable, Copyable, Tick if (!(living instanceof Pony)) { foundStacks.forEach(stack -> { - if (getTicks((Trackable)stack.getItem()) == 1) { - stack.inventoryTick(living.asWorld(), living.asEntity(), 0, false); - } + stack.inventoryTick(living.asWorld(), living.asEntity(), 0, false); }); } } + public long forceRemove(Trackable charm) { + @Nullable Long time = items.remove(charm); + return time == null ? 0 : time; + } + public long getTicks(Trackable charm) { return items.getOrDefault(charm.asItem(), 0L); } diff --git a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java index b84967f1..da56c65b 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AlicornAmuletItem.java @@ -134,7 +134,7 @@ public class AlicornAmuletItem extends AmuletItem implements ItemTracker.Trackab @Override public void onEquipped(Living wearer) { - wearer.playSound(USounds.ITEM_ALICORN_AMULET_CURSE, 3, 1); + wearer.playSound(USounds.ITEM_ALICORN_AMULET_CURSE, 0.5F, 1); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java b/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java index b59a878e..cb3426d5 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/AmuletItem.java @@ -68,7 +68,7 @@ public class AmuletItem extends WearableItem implements ChargeableItem { @Override public EquipmentSlot getSlotType(ItemStack stack) { - return EquipmentSlot.CHEST; + return TrinketsDelegate.hasTrinkets() ? EquipmentSlot.OFFHAND : EquipmentSlot.CHEST; } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/util/SoundEmitter.java b/src/main/java/com/minelittlepony/unicopia/util/SoundEmitter.java index 033898ad..d9c8736a 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/SoundEmitter.java +++ b/src/main/java/com/minelittlepony/unicopia/util/SoundEmitter.java @@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.util; import com.minelittlepony.unicopia.EntityConvertable; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.util.math.random.Random; @@ -26,7 +27,11 @@ public interface SoundEmitter extends EntityConvertable { } static void playSoundAt(Entity entity, SoundEvent sound, SoundCategory category, float volume, float pitch) { - entity.getWorld().playSound(null, entity.getX(), entity.getY(), entity.getZ(), sound, category, volume, pitch); + if (entity.getWorld().isClient && entity instanceof PlayerEntity p) { + entity.getWorld().playSound(p, entity.getX(), entity.getY(), entity.getZ(), sound, category, volume, pitch); + } else { + entity.getWorld().playSound(null, entity.getX(), entity.getY(), entity.getZ(), sound, category, volume, pitch); + } } static float getRandomPitch(Random rng) { From 599dfea71166761a097c9faf3255501a0d393c5a Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 00:25:26 +0000 Subject: [PATCH 40/44] Remove unused field --- .../java/com/minelittlepony/unicopia/entity/ItemTracker.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java index dbd889d1..30334093 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java @@ -35,7 +35,6 @@ public class ItemTracker implements NbtSerialisable, Copyable, Tick } private final Map items = new HashMap<>(); - private final Map forced = new HashMap<>(); public static Predicate wearing(Trackable charm, Predicate range) { return e -> Living.getOrEmpty(e) From 2dffb92e54da89154027b8af8a9807db654bb441 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 19:39:33 +0000 Subject: [PATCH 41/44] Move additional tags to datagen --- .../com/minelittlepony/unicopia/UTags.java | 1 + .../datagen/providers/UItemTagProvider.java | 15 ++++++++++ .../tags/items/loot_bug_high_value_drops.json | 29 ------------------- .../data/unicopia/tags/items/shades.json | 13 --------- 4 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json delete mode 100644 src/main/resources/data/unicopia/tags/items/shades.json diff --git a/src/main/java/com/minelittlepony/unicopia/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java index b95d8350..f15c228e 100644 --- a/src/main/java/com/minelittlepony/unicopia/UTags.java +++ b/src/main/java/com/minelittlepony/unicopia/UTags.java @@ -26,6 +26,7 @@ public interface UTags { TagKey IS_DELIVERED_AGGRESSIVELY = item("is_delivered_aggressively"); TagKey FLOATS_ON_CLOUDS = item("floats_on_clouds"); TagKey COOLS_OFF_KIRINS = item("cools_off_kirins"); + TagKey LOOT_BUG_HIGH_VALUE_DROPS = item("loot_bug_high_value_drops"); TagKey SHELLS = item("food_types/shells"); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java index 72b6e5a7..9e319abf 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java @@ -90,6 +90,11 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(UTags.FALLS_SLOWLY).add(Items.FEATHER, UItems.CLOUD_LUMP).forceAddTag(UTags.MAGIC_FEATHERS); getOrCreateTagBuilder(UTags.IS_DELIVERED_AGGRESSIVELY).forceAddTag(ItemTags.ANVIL); getOrCreateTagBuilder(UTags.SPOOKED_MOB_DROPS).add(Items.BRICK); + getOrCreateTagBuilder(UTags.SHADES).add( + Items.CARVED_PUMPKIN, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.PLAYER_HEAD, + Items.ZOMBIE_HEAD, Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PIGLIN_HEAD, + UItems.SUNGLASSES + ); getOrCreateTagBuilder(UTags.FLOATS_ON_CLOUDS) .forceAddTag(UTags.Items.CLOUD_BEDS) .forceAddTag(UTags.Items.CLOUD_SLABS) @@ -103,6 +108,16 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { Items.DEBUG_STICK, Items.COMMAND_BLOCK_MINECART, UItems.PLUNDER_VINE ).forceAddTag(UTags.BADGES); + getOrCreateTagBuilder(UTags.LOOT_BUG_HIGH_VALUE_DROPS).add( + Items.DIAMOND, Items.GOLDEN_APPLE, Items.GOLDEN_CARROT, + Items.GOLDEN_HELMET, Items.GOLDEN_BOOTS, Items.GOLDEN_LEGGINGS, Items.GOLDEN_CHESTPLATE, + Items.GOLDEN_HORSE_ARMOR, + Items.GOLDEN_PICKAXE, Items.GOLDEN_SHOVEL, Items.GOLDEN_AXE, Items.GOLDEN_SWORD, Items.GOLDEN_HOE, + UItems.GOLDEN_HORSE_SHOE, UItems.GOLDEN_POLEARM, UItems.GOLDEN_FEATHER, UItems.GOLDEN_WING, + UItems.GOLDEN_OAK_SEEDS + ).forceAddTag(ConventionalItemTags.NUGGETS) + .forceAddTag(ConventionalItemTags.GOLD_INGOTS).forceAddTag(ConventionalItemTags.RAW_GOLD_ORES).forceAddTag(ConventionalItemTags.RAW_GOLD_BLOCKS) + .addOptionalTag(new Identifier("farmersdelight:golden_knife")); exportFarmersDelightItems(); } diff --git a/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json b/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json deleted file mode 100644 index c0417584..00000000 --- a/src/main/resources/data/unicopia/tags/items/loot_bug_high_value_drops.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:diamond", - "minecraft:gold_nugget", - "minecraft:iron_nugget", - "#c:gold_ingots", - "#c:raw_gold_ores", - "#c:raw_gold_blocks", - "minecraft:golden_apple", - "minecraft:golden_carrot", - "minecraft:golden_boots", - "minecraft:golden_leggings", - "minecraft:golden_chestplate", - "minecraft:golden_helmet", - "minecraft:golden_horse_armor", - "unicopia:golden_horse_shoe", - "minecraft:golden_pickaxe", - "minecraft:golden_axe", - "minecraft:golden_shovel", - "minecraft:golden_sword", - "minecraft:golden_hoe", - "unicopia:golden_polearm", - "unicopia:golden_feather", - "unicopia:golden_wing", - "unicopia:golden_oak_seeds", - { "id": "farmersdelight:golden_knife", "required": false } - ] -} diff --git a/src/main/resources/data/unicopia/tags/items/shades.json b/src/main/resources/data/unicopia/tags/items/shades.json deleted file mode 100644 index 69cc87df..00000000 --- a/src/main/resources/data/unicopia/tags/items/shades.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:carved_pumpkin", - "minecraft:skeleton_skull", - "minecraft:wither_skeleton_skull", - "minecraft:player_head", - "minecraft:zombie_head", - "minecraft:creeper_head", - "minecraft:dragon_head", - "unicopia:sunglasses" - ] -} From 3b4639d5dafb693e44acfffa8e300e8daec86722 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 19:40:31 +0000 Subject: [PATCH 42/44] Move seasons data to datagen and add growth speeds for bananas, palm trees, and golden oak trees --- .../unicopia/datagen/Datagen.java | 2 + .../providers/SeasonsGrowthRatesProvider.java | 93 +++++++++++++++++++ .../seasons/crop/green_apple_leaves.json | 6 -- .../seasons/crop/green_apple_sapling.json | 6 -- .../seasons/crop/green_apple_sprout.json | 6 -- .../unicopia/seasons/crop/mango_leaves.json | 6 -- .../unicopia/seasons/crop/mango_sapling.json | 6 -- .../data/unicopia/seasons/crop/oats.json | 6 -- .../unicopia/seasons/crop/oats_crown.json | 6 -- .../data/unicopia/seasons/crop/oats_stem.json | 6 -- .../data/unicopia/seasons/crop/rocks.json | 6 -- .../seasons/crop/sour_apple_leaves.json | 6 -- .../seasons/crop/sour_apple_sapling.json | 6 -- .../seasons/crop/sour_apple_sprout.json | 6 -- .../seasons/crop/sweet_apple_leaves.json | 6 -- .../seasons/crop/sweet_apple_sapling.json | 6 -- .../seasons/crop/sweet_apple_sprout.json | 6 -- 17 files changed, 95 insertions(+), 90 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsGrowthRatesProvider.java delete mode 100644 src/main/resources/data/unicopia/seasons/crop/green_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/green_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/green_apple_sprout.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/mango_leaves.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/mango_sapling.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/oats.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/oats_crown.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/oats_stem.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/rocks.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sour_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sour_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sour_apple_sprout.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sweet_apple_leaves.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sweet_apple_sapling.json delete mode 100644 src/main/resources/data/unicopia/seasons/crop/sweet_apple_sprout.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java index 9cfcbe8b..24f1f53b 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java @@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.datagen; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.minelittlepony.unicopia.datagen.providers.SeasonsGrowthRatesProvider; import com.minelittlepony.unicopia.datagen.providers.UBlockTagProvider; import com.minelittlepony.unicopia.datagen.providers.UItemTagProvider; import com.minelittlepony.unicopia.datagen.providers.UModelProvider; @@ -36,6 +37,7 @@ public class Datagen implements DataGeneratorEntrypoint { pack.addProvider(UBlockLootTableProvider::new); pack.addProvider(UBlockAdditionsLootTableProvider::new); pack.addProvider(UChestAdditionsLootTableProvider::new); + pack.addProvider(SeasonsGrowthRatesProvider::new); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsGrowthRatesProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsGrowthRatesProvider.java new file mode 100644 index 00000000..186c0685 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsGrowthRatesProvider.java @@ -0,0 +1,93 @@ +package com.minelittlepony.unicopia.datagen.providers; + +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.DataCollector; +import com.minelittlepony.unicopia.server.world.UTreeGen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.minecraft.block.Block; +import net.minecraft.data.DataOutput; +import net.minecraft.data.DataOutput.PathResolver; +import net.minecraft.registry.Registries; +import net.minecraft.data.DataProvider; +import net.minecraft.data.DataWriter; + +public class SeasonsGrowthRatesProvider implements DataProvider { + + private final PathResolver pathResolver; + + public SeasonsGrowthRatesProvider(FabricDataOutput output) { + this.pathResolver = output.getResolver(DataOutput.OutputType.DATA_PACK, "seasons/crop"); + } + + @Override + public String getName() { + return "Seasons Growth Rates"; + } + + @Override + public CompletableFuture run(DataWriter writer) { + DataCollector collectedData = new DataCollector(pathResolver); + var exporter = collectedData.prime(); + generate((block, crop) -> { + exporter.accept(Registries.BLOCK.getId(block), crop::toJson); + }); + return collectedData.upload(writer); + } + + private void generate(BiConsumer exporter) { + Crop greenApple = new Crop(0.5F, 0.6F, 1, 0); + exporter.accept(UBlocks.GREEN_APPLE_LEAVES, greenApple); + exporter.accept(UBlocks.GREEN_APPLE_SPROUT, greenApple); + exporter.accept(UTreeGen.GREEN_APPLE_TREE.sapling().get(), greenApple); + + Crop sourApple = new Crop(0.25F, 0.5F, 1, 0.5F); + exporter.accept(UBlocks.SOUR_APPLE_LEAVES, sourApple); + exporter.accept(UBlocks.SOUR_APPLE_SPROUT, sourApple); + exporter.accept(UTreeGen.SOUR_APPLE_TREE.sapling().get(), sourApple); + + Crop sweetApple = new Crop(1, 1, 0.6F, 0); + exporter.accept(UBlocks.SWEET_APPLE_LEAVES, sweetApple); + exporter.accept(UBlocks.SWEET_APPLE_SPROUT, sweetApple); + exporter.accept(UTreeGen.SWEET_APPLE_TREE.sapling().get(), sweetApple); + + Crop goldenOak = new Crop(1.5F, 1.4F, 0.6F, 0); + exporter.accept(UBlocks.GOLDEN_OAK_LEAVES, goldenOak); + exporter.accept(UBlocks.GOLDEN_OAK_SPROUT, goldenOak); + exporter.accept(UTreeGen.GOLDEN_APPLE_TREE.sapling().get(), goldenOak); + + Crop palm = new Crop(1.1F, 0.9F, 0.2F, 0); + exporter.accept(UBlocks.PALM_LEAVES, palm); + exporter.accept(UBlocks.BANANAS, palm); + exporter.accept(UTreeGen.BANANA_TREE.sapling().get(), palm); + + Crop mango = new Crop(1, 1.6F, 0.5F, 0); + exporter.accept(UBlocks.MANGO_LEAVES, mango); + exporter.accept(UTreeGen.MANGO_TREE.sapling().get(), mango); + + Crop oats = new Crop(0.6F, 1, 1, 0); + exporter.accept(UBlocks.OATS_CROWN, oats); + exporter.accept(UBlocks.OATS_STEM, oats); + exporter.accept(UBlocks.OATS, oats); + + exporter.accept(UBlocks.ROCKS, new Crop(1, 1, 1, 1)); + exporter.accept(UBlocks.PINEAPPLE, palm); + } + + record Crop(float spring, float summer, float fall, float winter) { + + JsonElement toJson() { + JsonObject json = new JsonObject(); + json.addProperty("spring", spring); + json.addProperty("summer", summer); + json.addProperty("winter", winter); + json.addProperty("fall", fall); + return json; + } + } +} diff --git a/src/main/resources/data/unicopia/seasons/crop/green_apple_leaves.json b/src/main/resources/data/unicopia/seasons/crop/green_apple_leaves.json deleted file mode 100644 index 7c87009a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/green_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.5, - "summer": 0.6, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/green_apple_sapling.json b/src/main/resources/data/unicopia/seasons/crop/green_apple_sapling.json deleted file mode 100644 index 7c87009a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/green_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.5, - "summer": 0.6, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/green_apple_sprout.json b/src/main/resources/data/unicopia/seasons/crop/green_apple_sprout.json deleted file mode 100644 index 7c87009a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/green_apple_sprout.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.5, - "summer": 0.6, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/mango_leaves.json b/src/main/resources/data/unicopia/seasons/crop/mango_leaves.json deleted file mode 100644 index 0197bee9..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/mango_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.6, - "fall": 0.5, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/mango_sapling.json b/src/main/resources/data/unicopia/seasons/crop/mango_sapling.json deleted file mode 100644 index 0197bee9..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/mango_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.6, - "fall": 0.5, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/oats.json b/src/main/resources/data/unicopia/seasons/crop/oats.json deleted file mode 100644 index 0cbd2f20..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/oats.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.6, - "summer": 1.0, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/oats_crown.json b/src/main/resources/data/unicopia/seasons/crop/oats_crown.json deleted file mode 100644 index 0cbd2f20..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/oats_crown.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.6, - "summer": 1.0, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/oats_stem.json b/src/main/resources/data/unicopia/seasons/crop/oats_stem.json deleted file mode 100644 index 0cbd2f20..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/oats_stem.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.6, - "summer": 1.0, - "fall": 1.0, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/rocks.json b/src/main/resources/data/unicopia/seasons/crop/rocks.json deleted file mode 100644 index 139f30a0..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/rocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.0, - "fall": 1.0, - "winter": 1.0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sour_apple_leaves.json b/src/main/resources/data/unicopia/seasons/crop/sour_apple_leaves.json deleted file mode 100644 index 8b9d321a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sour_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.25, - "summer": 0.5, - "fall": 1.0, - "winter": 0.5 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sour_apple_sapling.json b/src/main/resources/data/unicopia/seasons/crop/sour_apple_sapling.json deleted file mode 100644 index 8b9d321a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sour_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.25, - "summer": 0.5, - "fall": 1.0, - "winter": 0.5 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sour_apple_sprout.json b/src/main/resources/data/unicopia/seasons/crop/sour_apple_sprout.json deleted file mode 100644 index 8b9d321a..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sour_apple_sprout.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 0.25, - "summer": 0.5, - "fall": 1.0, - "winter": 0.5 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_leaves.json b/src/main/resources/data/unicopia/seasons/crop/sweet_apple_leaves.json deleted file mode 100644 index 06ea5e21..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_leaves.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.0, - "fall": 0.6, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sapling.json b/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sapling.json deleted file mode 100644 index 06ea5e21..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sapling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.0, - "fall": 0.6, - "winter": 0 -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sprout.json b/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sprout.json deleted file mode 100644 index 06ea5e21..00000000 --- a/src/main/resources/data/unicopia/seasons/crop/sweet_apple_sprout.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "spring": 1.0, - "summer": 1.0, - "fall": 0.6, - "winter": 0 -} \ No newline at end of file From 7d59e1e0bf5e7ef5f7db4ae86dfaf39cacf17262 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 21:32:02 +0000 Subject: [PATCH 43/44] Fix enchantment occurances and remove the curse rank from clingy. Fixes #306 --- .../item/enchantment/SimpleEnchantment.java | 31 +++++----- .../item/enchantment/UEnchantments.java | 58 +++++++++++++++---- 2 files changed, 63 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/item/enchantment/SimpleEnchantment.java b/src/main/java/com/minelittlepony/unicopia/item/enchantment/SimpleEnchantment.java index 805c40a4..1a233623 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/enchantment/SimpleEnchantment.java +++ b/src/main/java/com/minelittlepony/unicopia/item/enchantment/SimpleEnchantment.java @@ -59,7 +59,7 @@ public class SimpleEnchantment extends Enchantment { @Override public final boolean isAvailableForRandomSelection() { - return options.looted; + return options.table; } public static class Data { @@ -77,8 +77,8 @@ public class SimpleEnchantment extends Enchantment { public static class Options { private boolean cursed; private boolean treasured; - private boolean traded = true; - private boolean looted = true; + private boolean traded; + private boolean table; private Rarity rarity; private int maxLevel = 1; private EquipmentSlot[] slots; @@ -102,6 +102,9 @@ public class SimpleEnchantment extends Enchantment { this.target = target; } + /** + * Sets the enchantment to apply to all items. + */ public Options ignoreTarget() { allItems = true; return this; @@ -128,8 +131,7 @@ public class SimpleEnchantment extends Enchantment { } /** - * Treasure enchantments only generate in loot tables with high-value items or by trading with villagers. - * They do not appear in the enchanting table. + * Whether this enchantment should be limited to high value trades or leveled up enchanting table offers. */ public Options treasure() { treasured = true; @@ -137,25 +139,24 @@ public class SimpleEnchantment extends Enchantment { } /** - * Loot-Only enchantments do not appear in villager trades. - * They may still appear in loot table generation and can be found in the enchanting table. + * Set whether this enchantment should appear in villager trades. */ - public Options lootedOnly() { - traded = false; - looted = true; + public Options traded() { + this.traded = true; return this; } /** - * Trade-Only enchantments are excluded from loot table generation and do not appear in the enchanting table. - * They can only be found by trading with villagers. + * Sets whether the enchantment should appear in enchanting table draws. */ - public Options tradedOnly() { - looted = false; - traded = true; + public Options table() { + this.table = true; return this; } + /** + * Sets the maximum level for the enchantment. + */ public Options maxLevel(int level) { maxLevel = level; return this; diff --git a/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java b/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java index 5b719f14..2085f490 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java +++ b/src/main/java/com/minelittlepony/unicopia/item/enchantment/UEnchantments.java @@ -24,18 +24,30 @@ public interface UEnchantments { /** * Makes a sound when there are interesting blocks in your area. + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment GEM_FINDER = register("gem_finder", new GemFindingEnchantment(Options.create(EnchantmentTarget.DIGGER, UEnchantmentValidSlots.HANDS).rarity(Rarity.RARE).maxLevel(3).treasure())); + Enchantment GEM_FINDER = register("gem_finder", new GemFindingEnchantment(Options.create(EnchantmentTarget.DIGGER, UEnchantmentValidSlots.HANDS).rarity(Rarity.RARE).maxLevel(3).treasure().traded().table())); /** * Protects against wall collisions and earth pony attacks! + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment PADDED = register("padded", new SimpleEnchantment(Options.armor().rarity(Rarity.UNCOMMON).maxLevel(3))); + Enchantment PADDED = register("padded", new SimpleEnchantment(Options.armor().rarity(Rarity.UNCOMMON).maxLevel(3).traded().table())); /** * Heavy players move more slowly but are less likely to be flung around wildly. + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment HEAVY = register("heavy", new AttributedEnchantment(Options.armor().rarity(Rarity.RARE).maxLevel(4))) + Enchantment HEAVY = register("heavy", new AttributedEnchantment(Options.armor().rarity(Rarity.RARE).maxLevel(4).traded().table())) .addModifier(EntityAttributes.GENERIC_MOVEMENT_SPEED, (user, level) -> { return new EntityAttributeModifier(UUID.fromString("a3d5a94f-4c40-48f6-a343-558502a13e10"), "Heavyness", (1 - level/(float)10) - 1, Operation.MULTIPLY_TOTAL); }); @@ -44,13 +56,20 @@ public interface UEnchantments { * It's dangerous to go alone, take this! * * Weapons will become stronger the more allies you have around. + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment HERDS = register("herds", new CollaboratorEnchantment(Options.create(EnchantmentTarget.WEAPON, EquipmentSlot.MAINHAND).rarity(Rarity.RARE).maxLevel(3))); + Enchantment HERDS = register("herds", new CollaboratorEnchantment(Options.create(EnchantmentTarget.WEAPON, EquipmentSlot.MAINHAND).rarity(Rarity.RARE).maxLevel(3).treasure().traded().table())); /** * Alters gravity + * + * Appears in: + * - Trades */ - Enchantment REPULSION = register("repulsion", new AttributedEnchantment(Options.create(EnchantmentTarget.ARMOR_FEET, EquipmentSlot.FEET).rarity(Rarity.VERY_RARE).maxLevel(3))) + Enchantment REPULSION = register("repulsion", new AttributedEnchantment(Options.create(EnchantmentTarget.ARMOR_FEET, EquipmentSlot.FEET).rarity(Rarity.VERY_RARE).maxLevel(3).treasure().traded())) .addModifier(UEntityAttributes.ENTITY_GRAVITY_MODIFIER, (user, level) -> { return new EntityAttributeModifier(UUID.fromString("1734bbd6-1916-4124-b710-5450ea70fbdb"), "Anti Grav", (0.5F - (0.375 * (level - 1))) - 1, Operation.MULTIPLY_TOTAL); }); @@ -60,35 +79,52 @@ public interface UEnchantments { * * Mobs really want your candy. You'd better give it to them. */ - Enchantment WANT_IT_NEED_IT = register("want_it_need_it", new WantItNeedItEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().treasure())); + Enchantment WANT_IT_NEED_IT = register("want_it_need_it", new WantItNeedItEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().treasure().traded())); /** * Hahaha geddit? * * Random things happen. + * + * Appears in: + * - Trades */ - PoisonedJokeEnchantment POISONED_JOKE = register("poisoned_joke", new PoisonedJokeEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().tradedOnly())); + PoisonedJokeEnchantment POISONED_JOKE = register("poisoned_joke", new PoisonedJokeEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().traded())); /** * Who doesn't like a good freakout? + * + * Appears in: + * - Trades */ - Enchantment STRESSED = register("stressed", new StressfulEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().treasure().maxLevel(3))); + Enchantment STRESSED = register("stressed", new StressfulEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().treasure().traded().maxLevel(3))); /** * This item just wants to be held. + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment CLINGY = register("clingy", new SimpleEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).curse().maxLevel(6))); + Enchantment CLINGY = register("clingy", new SimpleEnchantment(Options.allItems().rarity(Rarity.VERY_RARE).maxLevel(6).traded().table().treasure())); /** * Items with loyalty are kept after death. * Only works if they don't also have curse of binding. + * + * Appears in: + * - Enchanting Table */ - Enchantment HEART_BOUND = register("heart_bound", new SimpleEnchantment(Options.create(EnchantmentTarget.VANISHABLE, UEnchantmentValidSlots.ANY).rarity(Rarity.UNCOMMON).maxLevel(5))); + Enchantment HEART_BOUND = register("heart_bound", new SimpleEnchantment(Options.create(EnchantmentTarget.VANISHABLE, UEnchantmentValidSlots.ANY).rarity(Rarity.UNCOMMON).maxLevel(5).treasure().table())); /** * Consumes drops whilst mining and produces experience instead + * + * Appears in: + * - Trades + * - Enchanting Table */ - Enchantment CONSUMPTION = register("consumption", new ConsumptionEnchantment(Options.create(EnchantmentTarget.DIGGER, UEnchantmentValidSlots.HANDS).rarity(Rarity.VERY_RARE))); + Enchantment CONSUMPTION = register("consumption", new ConsumptionEnchantment(Options.create(EnchantmentTarget.DIGGER, UEnchantmentValidSlots.HANDS).rarity(Rarity.VERY_RARE).treasure().table().traded())); static void bootstrap() { } From 1e8b6ebaab9ab977d8e985e184f5d8f327e33ea6 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 20 Mar 2024 21:38:42 +0000 Subject: [PATCH 44/44] Set up recipe datagen --- .../unicopia/datagen/ItemFamilies.java | 21 ++++++ .../unicopia/datagen/UBlockFamilies.java | 22 ++++++ .../providers/UBlockStateModelGenerator.java | 19 +---- .../datagen/providers/UItemTagProvider.java | 14 ++-- .../datagen/providers/URecipeProvider.java | 70 +++++++++++++++++++ .../data/unicopia/recipes/acacia_basket.json | 18 ----- .../data/unicopia/recipes/bamboo_basket.json | 18 ----- .../data/unicopia/recipes/birch_basket.json | 18 ----- .../data/unicopia/recipes/cherry_basket.json | 18 ----- .../unicopia/recipes/dark_oak_basket.json | 18 ----- .../data/unicopia/recipes/jungle_basket.json | 18 ----- .../unicopia/recipes/mangrove_basket.json | 18 ----- .../data/unicopia/recipes/oak_basket.json | 18 ----- .../data/unicopia/recipes/palm_basket.json | 18 ----- .../data/unicopia/recipes/palm_boat.json | 16 ----- .../data/unicopia/recipes/palm_button.json | 12 ---- .../unicopia/recipes/palm_chest_boat.json | 15 ---- .../data/unicopia/recipes/palm_door.json | 18 ----- .../data/unicopia/recipes/palm_fence.json | 20 ------ .../unicopia/recipes/palm_fence_gate.json | 19 ----- .../unicopia/recipes/palm_hanging_sign.json | 21 ------ .../data/unicopia/recipes/palm_planks.json | 12 ---- .../unicopia/recipes/palm_pressure_plate.json | 15 ---- .../data/unicopia/recipes/palm_sign.json | 21 ------ .../data/unicopia/recipes/palm_slab.json | 16 ----- .../data/unicopia/recipes/palm_stairs.json | 18 ----- .../data/unicopia/recipes/palm_trapdoor.json | 17 ----- .../data/unicopia/recipes/palm_wood.json | 18 ----- .../data/unicopia/recipes/spruce_basket.json | 18 ----- .../unicopia/recipes/waxed_zap_fence.json | 8 --- .../recipes/waxed_zap_fence_gate.json | 8 --- .../unicopia/recipes/waxed_zap_planks.json | 8 --- .../data/unicopia/recipes/waxed_zap_slab.json | 8 --- .../unicopia/recipes/waxed_zap_stairs.json | 8 --- .../data/unicopia/recipes/waxed_zap_wood.json | 8 --- .../data/unicopia/recipes/zap_fence.json | 20 ------ .../data/unicopia/recipes/zap_fence_gate.json | 19 ----- .../data/unicopia/recipes/zap_planks.json | 12 ---- .../data/unicopia/recipes/zap_slab.json | 16 ----- .../data/unicopia/recipes/zap_stairs.json | 18 ----- .../data/unicopia/recipes/zap_wood.json | 15 ---- 41 files changed, 123 insertions(+), 589 deletions(-) create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/ItemFamilies.java create mode 100644 src/main/java/com/minelittlepony/unicopia/datagen/UBlockFamilies.java delete mode 100644 src/main/resources/data/unicopia/recipes/acacia_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/bamboo_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/birch_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/cherry_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/dark_oak_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/jungle_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/mangrove_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/oak_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_boat.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_button.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_chest_boat.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_door.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_fence.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_hanging_sign.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_planks.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_pressure_plate.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_sign.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_slab.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_stairs.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_trapdoor.json delete mode 100644 src/main/resources/data/unicopia/recipes/palm_wood.json delete mode 100644 src/main/resources/data/unicopia/recipes/spruce_basket.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_fence.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_planks.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_slab.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_stairs.json delete mode 100644 src/main/resources/data/unicopia/recipes/waxed_zap_wood.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_fence.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_fence_gate.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_planks.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_slab.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_stairs.json delete mode 100644 src/main/resources/data/unicopia/recipes/zap_wood.json diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/ItemFamilies.java b/src/main/java/com/minelittlepony/unicopia/datagen/ItemFamilies.java new file mode 100644 index 00000000..2c518214 --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/ItemFamilies.java @@ -0,0 +1,21 @@ +package com.minelittlepony.unicopia.datagen; + +import com.minelittlepony.unicopia.item.UItems; + +import net.minecraft.item.Item; + +public interface ItemFamilies { + Item[] MUSIC_DISCS = { + UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR + }; + Item[] POLEARMS = { + UItems.WOODEN_POLEARM, UItems.STONE_POLEARM, UItems.IRON_POLEARM, UItems.GOLDEN_POLEARM, UItems.DIAMOND_POLEARM, UItems.NETHERITE_POLEARM + }; + Item[] HORSE_SHOES = { + UItems.IRON_HORSE_SHOE, UItems.GOLDEN_HORSE_SHOE, UItems.COPPER_HORSE_SHOE, UItems.NETHERITE_HORSE_SHOE + }; + Item[] BASKETS = { + UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, UItems.DARK_OAK_BASKET, + UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.PALM_BASKET, UItems.SPRUCE_BASKET + }; +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/UBlockFamilies.java b/src/main/java/com/minelittlepony/unicopia/datagen/UBlockFamilies.java new file mode 100644 index 00000000..624d3a9c --- /dev/null +++ b/src/main/java/com/minelittlepony/unicopia/datagen/UBlockFamilies.java @@ -0,0 +1,22 @@ +package com.minelittlepony.unicopia.datagen; + +import com.minelittlepony.unicopia.block.UBlocks; + +import net.minecraft.data.family.BlockFamily; + +public interface UBlockFamilies { + BlockFamily PALM = new BlockFamily.Builder(UBlocks.PALM_PLANKS) + .slab(UBlocks.PALM_SLAB).stairs(UBlocks.PALM_STAIRS).fence(UBlocks.PALM_FENCE).fenceGate(UBlocks.PALM_FENCE_GATE) + .button(UBlocks.PALM_BUTTON).pressurePlate(UBlocks.PALM_PRESSURE_PLATE).sign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN) + .door(UBlocks.PALM_DOOR).trapdoor(UBlocks.PALM_TRAPDOOR) + .group("wooden").unlockCriterionName("has_planks") + .build(); + BlockFamily ZAP = new BlockFamily.Builder(UBlocks.ZAP_PLANKS) + .slab(UBlocks.ZAP_SLAB).stairs(UBlocks.ZAP_STAIRS).fence(UBlocks.ZAP_FENCE).fenceGate(UBlocks.ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build(); + BlockFamily WAXED_ZAP = new BlockFamily.Builder(UBlocks.WAXED_ZAP_PLANKS) + .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) + .group("wooden").unlockCriterionName("has_planks") + .build(); +} diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java index eaceb1c5..9cd28f3a 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java @@ -16,6 +16,7 @@ import com.minelittlepony.unicopia.block.ShellsBlock; import com.minelittlepony.unicopia.block.SlimePustuleBlock; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.block.zap.ZapAppleLeavesBlock; +import com.minelittlepony.unicopia.datagen.UBlockFamilies; import com.minelittlepony.unicopia.server.world.Tree; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; @@ -36,7 +37,6 @@ import net.minecraft.data.client.TextureMap; import net.minecraft.data.client.TexturedModel; import net.minecraft.data.client.VariantsBlockStateSupplier; import net.minecraft.data.client.When; -import net.minecraft.data.family.BlockFamily; import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.registry.Registries; @@ -121,12 +121,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { // palm wood registerLog(UBlocks.PALM_LOG).log(UBlocks.PALM_LOG).wood(UBlocks.PALM_WOOD); registerLog(UBlocks.STRIPPED_PALM_LOG).log(UBlocks.STRIPPED_PALM_LOG).wood(UBlocks.STRIPPED_PALM_WOOD); - registerCubeAllModelTexturePool(UBlocks.PALM_PLANKS).family(new BlockFamily.Builder(UBlocks.PALM_PLANKS) - .slab(UBlocks.PALM_SLAB).stairs(UBlocks.PALM_STAIRS).fence(UBlocks.PALM_FENCE).fenceGate(UBlocks.PALM_FENCE_GATE) - .button(UBlocks.PALM_BUTTON).pressurePlate(UBlocks.PALM_PRESSURE_PLATE).sign(UBlocks.PALM_SIGN, UBlocks.PALM_WALL_SIGN) - .door(UBlocks.PALM_DOOR).trapdoor(UBlocks.PALM_TRAPDOOR) - .group("wooden").unlockCriterionName("has_planks") - .build()); + registerCubeAllModelTexturePool(UBlocks.PALM_PLANKS).family(UBlockFamilies.PALM); registerHangingSign(UBlocks.STRIPPED_PALM_LOG, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_WALL_HANGING_SIGN); registerSimpleCubeAll(UBlocks.PALM_LEAVES); @@ -137,15 +132,7 @@ public class UBlockStateModelGenerator extends BlockStateModelGenerator { registerLog(UBlocks.STRIPPED_ZAP_LOG) .log(UBlocks.STRIPPED_ZAP_LOG).wood(UBlocks.STRIPPED_ZAP_WOOD) .log(UBlocks.WAXED_STRIPPED_ZAP_LOG).wood(UBlocks.WAXED_STRIPPED_ZAP_WOOD); - registerCubeAllModelTexturePool(UBlocks.ZAP_PLANKS) - .family(new BlockFamily.Builder(UBlocks.ZAP_PLANKS) - .slab(UBlocks.ZAP_SLAB).stairs(UBlocks.ZAP_STAIRS).fence(UBlocks.ZAP_FENCE).fenceGate(UBlocks.ZAP_FENCE_GATE) - .group("wooden").unlockCriterionName("has_planks") - .build()) - .same(UBlocks.WAXED_ZAP_PLANKS).family(new BlockFamily.Builder(UBlocks.WAXED_ZAP_PLANKS) - .slab(UBlocks.WAXED_ZAP_SLAB).stairs(UBlocks.WAXED_ZAP_STAIRS).fence(UBlocks.WAXED_ZAP_FENCE).fenceGate(UBlocks.WAXED_ZAP_FENCE_GATE) - .group("wooden").unlockCriterionName("has_planks") - .build()); + registerCubeAllModelTexturePool(UBlocks.ZAP_PLANKS).family(UBlockFamilies.ZAP).same(UBlocks.WAXED_ZAP_PLANKS).family(UBlockFamilies.WAXED_ZAP); registerZapLeaves(UBlocks.ZAP_LEAVES); registerSingleton(UBlocks.FLOWERING_ZAP_LEAVES, TexturedModel.LEAVES); registerStateWithModelReference(UBlocks.ZAP_LEAVES_PLACEHOLDER, Blocks.AIR); diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java index 9e319abf..9121d3b8 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java @@ -8,6 +8,7 @@ import com.minelittlepony.unicopia.UConventionalTags; import com.minelittlepony.unicopia.UTags; import com.minelittlepony.unicopia.block.UBlocks; import com.minelittlepony.unicopia.datagen.Datagen; +import com.minelittlepony.unicopia.datagen.ItemFamilies; import com.minelittlepony.unicopia.item.BedsheetsItem; import com.minelittlepony.unicopia.item.UItems; @@ -28,6 +29,8 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { + + private final UBlockTagProvider blockTagProvider; public UItemTagProvider(FabricDataOutput output, CompletableFuture registriesFuture, UBlockTagProvider blockTagProvider) { @@ -57,21 +60,18 @@ public class UItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(ItemTags.CHEST_BOATS).add(UItems.PALM_CHEST_BOAT); getOrCreateTagBuilder(ItemTags.BOATS).add(UItems.PALM_BOAT); - getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR); + getOrCreateTagBuilder(ItemTags.MUSIC_DISCS).add(ItemFamilies.MUSIC_DISCS); getOrCreateTagBuilder(ItemTags.CREEPER_DROP_MUSIC_DISCS).add(UItems.MUSIC_DISC_CRUSADE, UItems.MUSIC_DISC_FUNK, UItems.MUSIC_DISC_PET, UItems.MUSIC_DISC_POPULAR); getOrCreateTagBuilder(ItemTags.SIGNS).add(UBlocks.PALM_SIGN.asItem()); getOrCreateTagBuilder(ItemTags.HANGING_SIGNS).add(UBlocks.PALM_HANGING_SIGN.asItem()); - getOrCreateTagBuilder(UTags.HORSE_SHOES).add(UItems.IRON_HORSE_SHOE, UItems.GOLDEN_HORSE_SHOE, UItems.COPPER_HORSE_SHOE, UItems.NETHERITE_HORSE_SHOE); - getOrCreateTagBuilder(UTags.POLEARMS).add(UItems.WOODEN_POLEARM, UItems.STONE_POLEARM, UItems.IRON_POLEARM, UItems.GOLDEN_POLEARM, UItems.DIAMOND_POLEARM, UItems.NETHERITE_POLEARM); + getOrCreateTagBuilder(UTags.HORSE_SHOES).add(ItemFamilies.HORSE_SHOES); + getOrCreateTagBuilder(UTags.POLEARMS).add(ItemFamilies.POLEARMS); getOrCreateTagBuilder(ItemTags.TOOLS).addTag(UTags.HORSE_SHOES).addTag(UTags.POLEARMS); - getOrCreateTagBuilder(UTags.BASKETS).add( - UItems.ACACIA_BASKET, UItems.BAMBOO_BASKET, UItems.BIRCH_BASKET, UItems.CHERRY_BASKET, UItems.DARK_OAK_BASKET, - UItems.JUNGLE_BASKET, UItems.MANGROVE_BASKET, UItems.OAK_BASKET, UItems.PALM_BASKET, UItems.SPRUCE_BASKET - ); + getOrCreateTagBuilder(UTags.BASKETS).add(ItemFamilies.BASKETS); getOrCreateTagBuilder(UTags.BADGES).add(Race.REGISTRY.stream() .map(race -> race.getId().withPath(p -> p + "_badge")) .flatMap(id -> Registries.ITEM.getOrEmpty(id).stream()) diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java index c40b7f1f..ae861761 100644 --- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java +++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java @@ -1,10 +1,29 @@ package com.minelittlepony.unicopia.datagen.providers; +import java.util.Arrays; +import java.util.NoSuchElementException; import java.util.function.Consumer; +import com.minelittlepony.unicopia.UTags; +import com.minelittlepony.unicopia.block.UBlocks; +import com.minelittlepony.unicopia.datagen.ItemFamilies; +import com.minelittlepony.unicopia.datagen.UBlockFamilies; +import com.minelittlepony.unicopia.item.UItems; + import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.block.Block; import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.RecipeProvider; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.server.recipe.VanillaRecipeProvider; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; public class URecipeProvider extends FabricRecipeProvider { public URecipeProvider(FabricDataOutput output) { @@ -13,7 +32,58 @@ public class URecipeProvider extends FabricRecipeProvider { @Override public void generate(Consumer exporter) { + Arrays.stream(ItemFamilies.BASKETS).forEach(basket -> { + offerBasketRecipe(exporter, basket, getMaterial(basket, "_basket", "_planks")); + }); + offerBoatRecipe(exporter, UItems.PALM_BOAT, UBlocks.PALM_PLANKS); + offerChestBoatRecipe(exporter, UItems.PALM_CHEST_BOAT, UItems.PALM_BOAT); + offerHangingSignRecipe(exporter, UBlocks.PALM_HANGING_SIGN, UBlocks.PALM_PLANKS); + offerPlanksRecipe(exporter, UBlocks.PALM_PLANKS, UTags.Items.PALM_LOGS, 4); + offerPlanksRecipe(exporter, UBlocks.ZAP_PLANKS, UTags.Items.ZAP_LOGS, 4); + offerPlanksRecipe(exporter, UBlocks.WAXED_ZAP_PLANKS, UTags.Items.WAXED_ZAP_LOGS, 4); + offerBarkBlockRecipe(exporter, UBlocks.PALM_WOOD, UBlocks.PALM_LOG); + offerBarkBlockRecipe(exporter, UBlocks.ZAP_WOOD, UBlocks.ZAP_LOG); + offerBarkBlockRecipe(exporter, UBlocks.WAXED_ZAP_WOOD, UBlocks.WAXED_ZAP_LOG); + generateFamily(exporter, UBlockFamilies.PALM); + generateFamily(exporter, UBlockFamilies.ZAP); + generateFamily(exporter, UBlockFamilies.WAXED_ZAP); + offerWaxingRecipes(exporter); + } + + private static Item getMaterial(Item output, String toStrip, String suffex) { + Identifier id = Registries.ITEM.getId(output).withPath(p -> p.replace(toStrip, "") + suffex); + return Registries.ITEM.getOrEmpty(id) + .or(() -> Registries.ITEM.getOrEmpty(new Identifier(Identifier.DEFAULT_NAMESPACE, id.getPath()))) + .orElseThrow(() -> new NoSuchElementException("No item with id " + id)); + } + + public static void offerBasketRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { + ShapedRecipeJsonBuilder.create(RecipeCategory.TRANSPORTATION, output) + .input(Character.valueOf('#'), input) + .pattern("# #") + .pattern("# #") + .pattern("###") + .group("basket") + .criterion(VanillaRecipeProvider.hasItem(input), VanillaRecipeProvider.conditionsFromItem(input)) + .offerTo(exporter); + } + + public static void offerWaxingRecipes(Consumer exporter) { + UBlockFamilies.WAXED_ZAP.getVariants().forEach((variant, output) -> { + Block input = UBlockFamilies.ZAP.getVariant(variant); + offerWaxingRecipe(exporter, output, input); + }); + offerWaxingRecipe(exporter, UBlocks.WAXED_ZAP_PLANKS, UBlocks.ZAP_PLANKS); + offerWaxingRecipe(exporter, UBlocks.WAXED_ZAP_WOOD, UBlocks.ZAP_WOOD); + } + + public static void offerWaxingRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output) + .input(input) + .input(Items.HONEYCOMB).group(RecipeProvider.getItemPath(output)) + .criterion(RecipeProvider.hasItem(input), RecipeProvider.conditionsFromItem(input)) + .offerTo(exporter, RecipeProvider.convertBetween(output, Items.HONEYCOMB)); } } diff --git a/src/main/resources/data/unicopia/recipes/acacia_basket.json b/src/main/resources/data/unicopia/recipes/acacia_basket.json deleted file mode 100644 index 203d1a53..00000000 --- a/src/main/resources/data/unicopia/recipes/acacia_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:acacia_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:acacia_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/bamboo_basket.json b/src/main/resources/data/unicopia/recipes/bamboo_basket.json deleted file mode 100644 index fc72bf8b..00000000 --- a/src/main/resources/data/unicopia/recipes/bamboo_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:bamboo_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:bamboo_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/birch_basket.json b/src/main/resources/data/unicopia/recipes/birch_basket.json deleted file mode 100644 index 66fe4b39..00000000 --- a/src/main/resources/data/unicopia/recipes/birch_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:birch_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:birch_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/cherry_basket.json b/src/main/resources/data/unicopia/recipes/cherry_basket.json deleted file mode 100644 index 3175b4bc..00000000 --- a/src/main/resources/data/unicopia/recipes/cherry_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:cherry_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:cherry_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/dark_oak_basket.json b/src/main/resources/data/unicopia/recipes/dark_oak_basket.json deleted file mode 100644 index e5fd7bdf..00000000 --- a/src/main/resources/data/unicopia/recipes/dark_oak_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:dark_oak_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:dark_oak_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/jungle_basket.json b/src/main/resources/data/unicopia/recipes/jungle_basket.json deleted file mode 100644 index 6b4dc584..00000000 --- a/src/main/resources/data/unicopia/recipes/jungle_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:jungle_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:jungle_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/mangrove_basket.json b/src/main/resources/data/unicopia/recipes/mangrove_basket.json deleted file mode 100644 index 37ed8383..00000000 --- a/src/main/resources/data/unicopia/recipes/mangrove_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:mangrove_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:mangrove_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/oak_basket.json b/src/main/resources/data/unicopia/recipes/oak_basket.json deleted file mode 100644 index dd7710e0..00000000 --- a/src/main/resources/data/unicopia/recipes/oak_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:oak_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:oak_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_basket.json b/src/main/resources/data/unicopia/recipes/palm_basket.json deleted file mode 100644 index 9a442dd4..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:palm_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_boat.json b/src/main/resources/data/unicopia/recipes/palm_boat.json deleted file mode 100644 index e47257d7..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_boat.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "boat", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "# #", - "###" - ], - "result": { - "item": "unicopia:palm_boat" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_button.json b/src/main/resources/data/unicopia/recipes/palm_button.json deleted file mode 100644 index 7f48e8da..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_button.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "wooden_button", - "ingredients": [ - { - "item": "unicopia:palm_planks" - } - ], - "result": { - "item": "unicopia:palm_button" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_chest_boat.json b/src/main/resources/data/unicopia/recipes/palm_chest_boat.json deleted file mode 100644 index f0d38ec2..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_chest_boat.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "group": "chest_boat", - "ingredients": [ - { - "item": "minecraft:chest" - }, - { - "item": "unicopia:palm_boat" - } - ], - "result": { - "item": "unicopia:palm_chest_boat" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_door.json b/src/main/resources/data/unicopia/recipes/palm_door.json deleted file mode 100644 index f91ce24b..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_door", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "##", - "##", - "##" - ], - "result": { - "count": 3, - "item": "unicopia:palm_door" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_fence.json b/src/main/resources/data/unicopia/recipes/palm_fence.json deleted file mode 100644 index d977cdde..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "W#W", - "W#W" - ], - "result": { - "count": 3, - "item": "unicopia:palm_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_fence_gate.json b/src/main/resources/data/unicopia/recipes/palm_fence_gate.json deleted file mode 100644 index 657bf954..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "#W#", - "#W#" - ], - "result": { - "item": "unicopia:palm_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_hanging_sign.json b/src/main/resources/data/unicopia/recipes/palm_hanging_sign.json deleted file mode 100644 index 1eb8892a..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_hanging_sign.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_sign", - "key": { - "#": { - "item": "unicopia:palm_planks" - }, - "|": { - "item": "minecraft:chain" - } - }, - "pattern": [ - "| |", - "###", - "###" - ], - "result": { - "count": 3, - "item": "unicopia:palm_hanging_sign" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_planks.json b/src/main/resources/data/unicopia/recipes/palm_planks.json deleted file mode 100644 index 2e94f502..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "planks", - "ingredients": [ - { "tag": "unicopia:palm_logs" } - ], - "result": { - "item": "unicopia:palm_planks", - "count": 4 - } -} diff --git a/src/main/resources/data/unicopia/recipes/palm_pressure_plate.json b/src/main/resources/data/unicopia/recipes/palm_pressure_plate.json deleted file mode 100644 index ec0b2d6b..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_pressure_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_pressure_plate", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "##" - ], - "result": { - "item": "unicopia:palm_pressure_plate" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_sign.json b/src/main/resources/data/unicopia/recipes/palm_sign.json deleted file mode 100644 index aff51be7..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_sign.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_sign", - "key": { - "#": { - "item": "unicopia:palm_planks" - }, - "X": { - "item": "minecraft:stick" - } - }, - "pattern": [ - "###", - "###", - " X " - ], - "result": { - "count": 3, - "item": "unicopia:palm_sign" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_slab.json b/src/main/resources/data/unicopia/recipes/palm_slab.json deleted file mode 100644 index aff63c12..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "###" - ], - "result": { - "count": 6, - "item": "unicopia:palm_slab" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_stairs.json b/src/main/resources/data/unicopia/recipes/palm_stairs.json deleted file mode 100644 index 0af4f2be..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "# ", - "## ", - "###" - ], - "result": { - "count": 4, - "item": "unicopia:palm_stairs" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_trapdoor.json b/src/main/resources/data/unicopia/recipes/palm_trapdoor.json deleted file mode 100644 index 16fda6df..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_trapdoor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_trapdoor", - "key": { - "#": { - "item": "unicopia:palm_planks" - } - }, - "pattern": [ - "###", - "###" - ], - "result": { - "count": 2, - "item": "unicopia:palm_trapdoor" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/palm_wood.json b/src/main/resources/data/unicopia/recipes/palm_wood.json deleted file mode 100644 index 2d4c9008..00000000 --- a/src/main/resources/data/unicopia/recipes/palm_wood.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "group": "bark", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "unicopia:palm_log" - } - }, - "result": { - "count": 3, - "item": "unicopia:palm_wood" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/spruce_basket.json b/src/main/resources/data/unicopia/recipes/spruce_basket.json deleted file mode 100644 index 99fb9ea4..00000000 --- a/src/main/resources/data/unicopia/recipes/spruce_basket.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "basket", - "key": { - "#": { - "item": "minecraft:spruce_planks" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "count": 1, - "item": "unicopia:spruce_basket" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_fence.json b/src/main/resources/data/unicopia/recipes/waxed_zap_fence.json deleted file mode 100644 index d7656e59..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_fence.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_fence" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_fence" } -} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_fence_gate.json b/src/main/resources/data/unicopia/recipes/waxed_zap_fence_gate.json deleted file mode 100644 index d345c274..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_fence_gate.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_fence_gate" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_fence_gate" } -} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_planks.json b/src/main/resources/data/unicopia/recipes/waxed_zap_planks.json deleted file mode 100644 index bea1a50b..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_planks.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_planks" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_planks" } -} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_slab.json b/src/main/resources/data/unicopia/recipes/waxed_zap_slab.json deleted file mode 100644 index 69d86f99..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_slab" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_slab" } -} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_stairs.json b/src/main/resources/data/unicopia/recipes/waxed_zap_stairs.json deleted file mode 100644 index 5af35664..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_stairs" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_stairs" } -} diff --git a/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json b/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json deleted file mode 100644 index 16fb5429..00000000 --- a/src/main/resources/data/unicopia/recipes/waxed_zap_wood.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { "item": "unicopia:zap_wood" }, - { "item": "minecraft:honeycomb" } - ], - "result": { "item": "unicopia:waxed_zap_wood" } -} diff --git a/src/main/resources/data/unicopia/recipes/zap_fence.json b/src/main/resources/data/unicopia/recipes/zap_fence.json deleted file mode 100644 index 78767a33..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_fence.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence", - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "unicopia:zap_planks" - } - }, - "pattern": [ - "W#W", - "W#W" - ], - "result": { - "count": 3, - "item": "unicopia:zap_fence" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/zap_fence_gate.json b/src/main/resources/data/unicopia/recipes/zap_fence_gate.json deleted file mode 100644 index af0711f9..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_fence_gate.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_fence_gate", - "key": { - "#": { - "item": "minecraft:stick" - }, - "W": { - "item": "unicopia:zap_planks" - } - }, - "pattern": [ - "#W#", - "#W#" - ], - "result": { - "item": "unicopia:zap_fence_gate" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/zap_planks.json b/src/main/resources/data/unicopia/recipes/zap_planks.json deleted file mode 100644 index 67667e65..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_planks.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "building", - "group": "planks", - "ingredients": [ - { "tag": "unicopia:zap_logs" } - ], - "result": { - "item": "unicopia:zap_planks", - "count": 4 - } -} diff --git a/src/main/resources/data/unicopia/recipes/zap_slab.json b/src/main/resources/data/unicopia/recipes/zap_slab.json deleted file mode 100644 index 26e9f755..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_slab", - "key": { - "#": { - "item": "unicopia:zap_planks" - } - }, - "pattern": [ - "###" - ], - "result": { - "count": 6, - "item": "unicopia:zap_slab" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/zap_stairs.json b/src/main/resources/data/unicopia/recipes/zap_stairs.json deleted file mode 100644 index 721f7fb1..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "group": "wooden_stairs", - "key": { - "#": { - "item": "unicopia:zap_planks" - } - }, - "pattern": [ - "# ", - "## ", - "###" - ], - "result": { - "count": 4, - "item": "unicopia:zap_stairs" - } -} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/recipes/zap_wood.json b/src/main/resources/data/unicopia/recipes/zap_wood.json deleted file mode 100644 index 7d1dbace..00000000 --- a/src/main/resources/data/unicopia/recipes/zap_wood.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "##", - "##" - ], - "key": { - "#": { - "item": "unicopia:zap_log" - } - }, - "result": { - "item": "unicopia:zap_wood" - } -} \ No newline at end of file