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 0768c5d5..87bf790b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,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()
@@ -98,6 +109,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/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<Entity> IS_CASTER = e -> !e.isRemoved() && (e instanceof Caster || IS_PLAYER.test(e));
     Predicate<Entity> IS_PLACED_SPELL = e -> e instanceof Caster && !e.isRemoved();
 
-    Predicate<Entity> IS_MAGIC_IMMUNE = e -> (e instanceof MagicImmune || !(e instanceof LivingEntity))
+    Predicate<Entity> 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<Entity> EXCEPT_MAGIC_IMMUNE = IS_MAGIC_IMMUNE.negate();
     Predicate<Entity> VALID_LIVING_AND_NOT_MAGIC_IMMUNE = EntityPredicates.VALID_LIVING_ENTITY.and(EXCEPT_MAGIC_IMMUNE);
 
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<Item> APPLES = item("apples");
+    TagKey<Item> ACORNS = item("acorns");
+    TagKey<Item> PINECONES = item("pinecones");
+    TagKey<Item> PINEAPPLES = item("pineapples");
+    TagKey<Item> BANANAS = item("bananas");
+    TagKey<Item> STICKS = item("sticks");
+    TagKey<Item> SEEDS = item("seeds");
+    TagKey<Item> GRAIN = item("grain");
+    TagKey<Item> NUTS = item("nuts");
+    TagKey<Item> MUSHROOMS = item("mushrooms");
+    TagKey<Item> MUFFINS = item("muffins");
+    TagKey<Item> MANGOES = item("mangoes");
+    TagKey<Item> OEATMEALS = item("oatmeals");
+
+    TagKey<Item> FRUITS = item("fruits");
+
+    TagKey<Item> COOKED_FISH = item("cooked_fish");
+
+    TagKey<Item> CROPS_PEANUTS = item("crops/peanuts");
+    TagKey<Item> TOOL_KNIVES = item("tools/knives");
+
+    static TagKey<Item> item(String name) {
+        return TagKey.of(RegistryKeys.ITEM, new Identifier("c", name));
+    }
+
+    static TagKey<Block> block(String name) {
+        return TagKey.of(RegistryKeys.BLOCK, new Identifier("c", name));
+    }
+}
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/UTags.java b/src/main/java/com/minelittlepony/unicopia/UTags.java
index 08da479c..f15c228e 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<Item> APPLES = item("apples");
     TagKey<Item> FRESH_APPLES = item("fresh_apples");
 
     TagKey<Item> FALLS_SLOWLY = item("falls_slowly");
@@ -27,16 +26,19 @@ public interface UTags {
     TagKey<Item> IS_DELIVERED_AGGRESSIVELY = item("is_delivered_aggressively");
     TagKey<Item> FLOATS_ON_CLOUDS = item("floats_on_clouds");
     TagKey<Item> COOLS_OFF_KIRINS = item("cools_off_kirins");
+    TagKey<Item> LOOT_BUG_HIGH_VALUE_DROPS = item("loot_bug_high_value_drops");
+
+    TagKey<Item> SHELLS = item("food_types/shells");
 
     TagKey<Item> POLEARMS = item("polearms");
     TagKey<Item> HORSE_SHOES = item("horse_shoes");
     TagKey<Item> APPLE_SEEDS = item("apple_seeds");
 
-    TagKey<Item> ACORNS = item("acorns");
     TagKey<Item> BASKETS = item("baskets");
+    TagKey<Item> BADGES = item("badges");
+    TagKey<Item> BED_SHEETS = item("bed_sheets");
+    TagKey<Item> CLOUD_JARS = item("cloud_jars");
 
-    TagKey<Block> GLASS_PANES = block("glass_panes");
-    TagKey<Block> GLASS_BLOCKS = block("glass_blocks");
     TagKey<Block> FRAGILE = block("fragile");
     TagKey<Block> INTERESTING = block("interesting");
     TagKey<Block> CATAPULT_IMMUNE = block("catapult_immune");
@@ -57,6 +59,28 @@ public interface UTags {
 
     TagKey<DimensionType> HAS_NO_ATMOSPHERE = dimension("has_no_atmosphere");
 
+    interface Items {
+        TagKey<Item> ZAP_LOGS = item("zap_logs");
+        TagKey<Item> WAXED_ZAP_LOGS = item("waxed_zap_logs");
+        TagKey<Item> PALM_LOGS = item("palm_logs");
+        TagKey<Item> CLOUD_BEDS = item("cloud_beds");
+        TagKey<Item> CLOUD_SLABS = item("cloud_slabs");
+        TagKey<Item> CLOUD_STAIRS = item("cloud_stairs");
+        TagKey<Item> CLOUD_BLOCKS = item("cloud_blocks");
+        TagKey<Item> CHITIN_BLOCKS = item("chitin_blocks");
+    }
+
+    interface Blocks {
+        TagKey<Block> ZAP_LOGS = block("zap_logs");
+        TagKey<Block> WAXED_ZAP_LOGS = block("waxed_zap_logs");
+        TagKey<Block> PALM_LOGS = block("palm_logs");
+        TagKey<Block> CLOUD_BEDS = block("cloud_beds");
+        TagKey<Block> CLOUD_SLABS = block("cloud_slabs");
+        TagKey<Block> CLOUD_STAIRS = block("cloud_stairs");
+        TagKey<Block> CLOUD_BLOCKS = block("cloud_blocks");
+        TagKey<Block> CHITIN_BLOCKS = block("chitin_blocks");
+    }
+
     static TagKey<Item> item(String name) {
         return TagKey.of(RegistryKeys.ITEM, Unicopia.id(name));
     }
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<Rot> {
 
     @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
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 c14dc59d..513552ac 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;
@@ -48,12 +51,12 @@ public class UnicornTeleportAbility implements Ability<Pos> {
 
     @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
@@ -78,8 +81,7 @@ public class UnicornTeleportAbility implements Ability<Pos> {
             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<Pos> {
         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<Pos> {
                 }).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<Pos> {
                     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<Pos> {
 
     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) {
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<T extends Spell> extends Predicate<Spell> {
     SpellPredicate<?> IS_NOT_PLACED = IS_PLACED.negate();
     SpellPredicate<?> IS_VISIBLE = spell -> spell != null && !spell.isHidden();
 
+    SpellPredicate<?> IS_CORRUPTING = spell -> spell.getAffinity() == Affinity.BAD;
+
     default <Q extends Spell> SpellPredicate<Q> and(SpellPredicate<Q> predicate) {
         SpellPredicate<T> self = this;
         return s -> self.test(s) && predicate.test(s);
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 -> {
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<MagicProjectileEntity> throwProjectile(Caster<?> caster) {
+    public Optional<MagicBeamEntity> 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<MagicProjectileEntity> throwProjectile(Caster<?> caster, float divergance) {
+    public Optional<MagicBeamEntity> 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/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<UUID, Target> targets = new TreeMap<>();
@@ -46,7 +45,6 @@ public class TargetSelecter {
     public Stream<Entity> 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/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/FruitBearingBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitBearingBlock.java
index 51c7b4a2..5239c57b 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> STAGE = EnumProperty.of("stage", Stage.class);
 
     private final Supplier<Block> 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<ItemStack> onBucked(ServerWorld world, BlockState state, BlockPos pos) {
         world.setBlockState(pos, state.with(STAGE, Stage.IDLE).with(AGE, 0));
@@ -142,18 +172,42 @@ public class FruitBearingBlock extends LeavesBlock implements TintedBlock, Bucka
         return state.getRenderingSeed(pos) % 3 == 1;
     }
 
+    @Override
+    public boolean isFertilizable(WorldView world, BlockPos pos, BlockState state) {
+        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);
+    }
+
+    @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);
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SegmentedCropBlock.java
index 2a67a88b..d6e72304 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/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> SHAPE = EnumProperty.of("shape", Shape.class);
+    public static final EnumProperty<Shape> 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/block/ThornBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ThornBlock.java
index c8ce695f..25ee7f42 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<BooleanProperty> 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<Block> bud;
 
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
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, BooleanProperty> DIRECTION_PROPERTIES = Map.of(
             Direction.UP, NORTH,
             Direction.DOWN, SOUTH
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();
     }
 
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
             );
 
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/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<Identifier> getTexture(RenderLayer layer) {
         if (layer instanceof RenderLayer.MultiPhase multiphase) {
             return multiphase.getPhases().texture.getId();
         }
         return Optional.empty();
     }
+
+    static void createUnionBuffer(Consumer<VertexConsumerProvider> action, VertexConsumerProvider vertices, Function<Identifier, RenderLayer> 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<Vec3d> 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/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<MagicProjectileEntity> {
+public class MagicBeamEntityRenderer extends EntityRenderer<MagicBeamEntity> {
     private final Model model;
 
     public MagicBeamEntityRenderer(EntityRendererFactory.Context ctx) {
@@ -32,17 +31,17 @@ public class MagicBeamEntityRenderer extends EntityRenderer<MagicProjectileEntit
     }
 
     @Override
-    public Identifier getTexture(MagicProjectileEntity entity) {
+    public Identifier getTexture(MagicBeamEntity entity) {
         return PlayerScreenHandler.BLOCK_ATLAS_TEXTURE;
     }
 
     @Override
-    protected int getBlockLight(MagicProjectileEntity entity, BlockPos pos) {
+    protected int getBlockLight(MagicBeamEntity entity, BlockPos pos) {
         return 15;
     }
 
     @Override
-    public void render(MagicProjectileEntity entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
+    public void render(MagicBeamEntity entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light) {
         if (entity.age < 2 && dispatcher.camera.getFocusedEntity().squaredDistanceTo(entity) < 8) {
             return;
         }
@@ -68,7 +67,7 @@ public class MagicBeamEntityRenderer extends EntityRenderer<MagicProjectileEntit
         super.render(entity, yaw, tickDelta, matrices, vertexConsumers, light);
     }
 
-    public class Model extends EntityModel<MagicProjectileEntity> {
+    public class Model extends EntityModel<MagicBeamEntity> {
 
         private final ModelPart part;
 
@@ -89,7 +88,7 @@ public class MagicBeamEntityRenderer extends EntityRenderer<MagicProjectileEntit
         }
 
         @Override
-        public void setAngles(MagicProjectileEntity entity, float limbAngle, float limbDistance, float customAngle, float headYaw, float headPitch) {
+        public void setAngles(MagicBeamEntity entity, float limbAngle, float limbDistance, float customAngle, float headYaw, float headPitch) {
             part.pitch = headPitch;
             part.yaw = headYaw;
         }
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/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 ad402f7d..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,6 +32,17 @@ 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);
         }
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<Identifier, Supplier<JsonElement>> values = new HashMap<>();
+
+    private final PathResolver resolver;
+
+    public DataCollector(PathResolver resolver) {
+        this.resolver = resolver;
+    }
+
+    public BiConsumer<Identifier, Supplier<JsonElement>> prime() {
+        values.clear();
+        return (Identifier id, Supplier<JsonElement> 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/Datagen.java b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java
new file mode 100644
index 00000000..24f1f53b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java
@@ -0,0 +1,51 @@
+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;
+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;
+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 {
+    public static final Logger LOGGER = LogManager.getLogger();
+
+    @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);
+        pack.addProvider(UBlockAdditionsLootTableProvider::new);
+        pack.addProvider(UChestAdditionsLootTableProvider::new);
+        pack.addProvider(SeasonsGrowthRatesProvider::new);
+    }
+
+    @Override
+    public void buildRegistry(RegistryBuilder builder) {
+        builder.addRegistry(RegistryKeys.BIOME, registerable -> {
+            RegistryEntryLookup<PlacedFeature> placedFeatureLookup = registerable.getRegistryLookup(RegistryKeys.PLACED_FEATURE);
+            RegistryEntryLookup<ConfiguredCarver<?>> 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/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/BlockModels.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java
new file mode 100644
index 00000000..68344833
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/BlockModels.java
@@ -0,0 +1,90 @@
+package com.minelittlepony.unicopia.datagen.providers;
+
+import java.util.Arrays;
+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 net.minecraft.block.Block;
+import net.minecraft.data.client.Model;
+import net.minecraft.data.client.ModelIds;
+import net.minecraft.data.client.Models;
+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.util.Identifier;
+import net.minecraft.util.Pair;
+
+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);
+    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);
+    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"};
+    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
+    };
+
+    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<Model, String>[] 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);
+    }
+
+    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 Model block(Identifier parent, String variant, TextureKey ... requiredTextureKeys) {
+        return new Model(Optional.of(parent.withPrefixedPath("block/")), Optional.of(variant), requiredTextureKeys);
+    }
+
+    public interface Factory {
+        static Factory of(Function<Identifier, TextureMap> textureFunc, Model model) {
+            return (block, suffix) -> TexturedModel.makeFactory(b -> textureFunc.apply(ModelIds.getBlockSubModelId(b, suffix)), model).get(block);
+        }
+
+        TexturedModel get(Block block, String suffix);
+
+        default Identifier upload(Block block, String suffix, BiConsumer<Identifier, Supplier<JsonElement>> writer) {
+            return get(block, suffix).upload(block, suffix, writer);
+        }
+    }
+}
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/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<Identifier> floorModels = getFireModels(modelGenerator, texture, "_floor").toList();
+        List<Identifier> 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<Identifier> 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
new file mode 100644
index 00000000..06d35675
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/ItemModels.java
@@ -0,0 +1,78 @@
+package com.minelittlepony.unicopia.datagen.providers;
+
+import java.util.Locale;
+import java.util.Optional;
+
+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;
+
+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 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);
+
+    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));
+        GENERATED.upload(ModelIds.getItemSubModelId(item, "_in_inventory"), textures, itemModelGenerator.writer);
+        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<Override> 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<ItemModelGenerator, Identifier> generator) {
+        return addOverride(Map.of(key, value), generator);
+    }
+
+    public ModelOverrides addOverride(Map<String, Float> predicate, Function<ItemModelGenerator, Identifier> 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<Pair<Identifier, Map<String, Float>>> 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<String, Float> 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<String, Float> predicate, Function<ItemModelGenerator, Identifier> model) {
+
+    }
+
+    public interface ModelVariantSupplier {
+        Identifier upload(int index, float value);
+    }
+}
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<Block, Crop> 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/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..5b5474bc
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/SeasonsModelGenerator.java
@@ -0,0 +1,51 @@
+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;
+
+public class SeasonsModelGenerator extends UBlockStateModelGenerator {
+
+    private static final String[] SEASONS = { "fall", "summer", "winter" };
+
+    public SeasonsModelGenerator(BlockStateModelGenerator modelGenerator, BiConsumer<Identifier, Supplier<JsonElement>> seasonsModelConsumer) {
+        super(modelGenerator.blockStateCollector, (id, jsonSupplier) -> {
+            modelGenerator.modelCollector.accept(id, jsonSupplier);
+            seasonsModelConsumer.accept(id, () -> {
+                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;
+    }
+
+    @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
new file mode 100644
index 00000000..9cd28f3a
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockStateModelGenerator.java
@@ -0,0 +1,524 @@
+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;
+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.datagen.UBlockFamilies;
+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;
+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.TextureMap;
+import net.minecraft.data.client.TexturedModel;
+import net.minecraft.data.client.VariantsBlockStateSupplier;
+import net.minecraft.data.client.When;
+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;
+
+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");
+
+    static UBlockStateModelGenerator create(BlockStateModelGenerator modelGenerator) {
+        return new UBlockStateModelGenerator(modelGenerator.blockStateCollector, modelGenerator.modelCollector, modelGenerator::excludeFromSimpleItemModelGeneration);
+    }
+
+    protected UBlockStateModelGenerator(BlockStateModelGenerator modelGenerator) {
+        this(modelGenerator.blockStateCollector, modelGenerator.modelCollector, modelGenerator::excludeFromSimpleItemModelGeneration);
+    }
+
+    public UBlockStateModelGenerator(
+            Consumer<BlockStateSupplier> blockStateCollector,
+            BiConsumer<Identifier, Supplier<JsonElement>> modelCollector,
+            Consumer<Block> 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() {
+        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);
+        // doors
+        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);
+        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(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);
+        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(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(UBlockFamilies.PALM);
+        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(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);
+
+        // 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);
+
+        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 }
+        );
+        registerPlunderVine(UBlocks.PLUNDER_VINE, 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
+        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()),
+                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 <T> UBlockStateModelGenerator registerAll(BiConsumer<? super UBlockStateModelGenerator, T> 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(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(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(MODEL, Models.CUBE_BOTTOM_TOP.upload(dirt, "_snow", model.getTextures()
+                        .copyAndAdd(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(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(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<Direction, BlockStateVariant> 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);
+        }
+        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 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(MODEL, ModelIds.getBlockSubModelId(block, "_corner_" + suffexes[v]))
+                        .put(UVLOCK, true)
+                        .put(X, xRot)
+                        .put(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 registerStableDoor(Block door) {
+        TextureMap topTextures = TextureMap.topBottom(door);
+        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,
+                BlockModels.DOOR_LEFT.upload(door, "_bottom_left", 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 void fillStableDoorVariantMap(
+            BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> variantMap,
+            DoubleBlockHalf targetHalf, Identifier leftModelId, Identifier rightModelId) {
+        fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, false, R0, leftModelId);
+        fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, false, R0, rightModelId);
+
+        fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.LEFT, true, R90, rightModelId);
+        fillStableDoorVariantMap(variantMap, targetHalf, DoorHinge.RIGHT, true, R270, leftModelId);
+    }
+
+    public static void fillStableDoorVariantMap(
+            BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> variantMap,
+            DoubleBlockHalf targetHalf,
+            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(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(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(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));
+        }));
+        Map<Integer, Identifier> 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(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(X, axis == Direction.Axis.Y ? R0 : R90)
+                        .put(Y, axis == Direction.Axis.X ? R90 : R0)
+                );
+            }
+        }
+
+        blockStateCollector.accept(supplier);
+    }
+
+    public void registerWithStages(Block crop, Property<Integer> ageProperty, BlockModels.Factory modelFactory, int ... stages) {
+        if (ageProperty.getValues().size() != stages.length) {
+            throw new IllegalArgumentException();
+        }
+        int offset = ageProperty.getValues().iterator().next();
+        Int2ObjectOpenHashMap<Identifier> uploadedModels = new Int2ObjectOpenHashMap<>();
+        blockStateCollector.accept(VariantsBlockStateSupplier.create(crop)
+                .coordinate(BlockStateVariantMap.create(ageProperty)
+                .register(age -> BlockStateVariant.create().put(MODEL, uploadedModels.computeIfAbsent(stages[age - offset], stage -> {
+                    return modelFactory.upload(crop, "_stage" + stage, modelCollector);
+                })))));
+    }
+
+    public void registerWithStagesBuiltinModels(Block crop, Property<Integer> 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(MODEL, ModelIds.getBlockSubModelId(crop, "_stage" + stages[age - offset])))));
+    }
+
+    public <T extends Enum<T> & StringIdentifiable> void registerTallCrop(Block crop,
+            Property<Integer> ageProperty,
+            EnumProperty<T> partProperty,
+            int[] ... ageTextureIndices) {
+        Map<String, Identifier> 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(MODEL, identifier);
+        })));
+    }
+
+    public void registerPie(Block pie) {
+        TextureMap textures = new TextureMap()
+                .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(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(ALL, ModelIds.getBlockSubModelId(block, "_flowering")), modelCollector);
+        blockStateCollector.accept(MultipartBlockStateSupplier.create(block)
+                .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) {
+        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(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(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(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(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/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..2deff29f
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UBlockTagProvider.java
@@ -0,0 +1,204 @@
+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.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.TagBuilder;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class UBlockTagProvider extends FabricTagProvider.BlockTagProvider {
+    public UBlockTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
+        super(output, registriesFuture);
+    }
+
+    @Override
+    protected TagBuilder getTagBuilder(TagKey<Block> tag) {
+        return super.getTagBuilder(tag);
+    }
+
+    @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();
+        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() {
+        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
+        );
+
+        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);
+        //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);
+        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);
+        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.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.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.Blocks.CLOUD_BLOCKS).add(
+                UBlocks.CLOUD, UBlocks.CLOUD_PLANKS, UBlocks.CLOUD_BRICKS, UBlocks.DENSE_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.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
+        );
+        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);
+    }
+}
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..9121d3b8
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UItemTagProvider.java
@@ -0,0 +1,189 @@
+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.datagen.ItemFamilies;
+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 {
+
+
+    private final UBlockTagProvider blockTagProvider;
+
+    public UItemTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture, UBlockTagProvider blockTagProvider) {
+        super(output, registriesFuture, blockTagProvider);
+        this.blockTagProvider = blockTagProvider;
+    }
+
+    @Override
+    public void copy(TagKey<Block> blockTag, TagKey<Item> 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);
+
+        getOrCreateTagBuilder(ItemTags.CHEST_BOATS).add(UItems.PALM_CHEST_BOAT);
+        getOrCreateTagBuilder(ItemTags.BOATS).add(UItems.PALM_BOAT);
+        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(ItemFamilies.HORSE_SHOES);
+        getOrCreateTagBuilder(UTags.POLEARMS).add(ItemFamilies.POLEARMS);
+
+        getOrCreateTagBuilder(ItemTags.TOOLS).addTag(UTags.HORSE_SHOES).addTag(UTags.POLEARMS);
+
+        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())
+                .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.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)
+            .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);
+        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();
+    }
+
+    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);
+
+        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/datagen/providers/UModelProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java
new file mode 100644
index 00000000..64bbc4be
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UModelProvider.java
@@ -0,0 +1,137 @@
+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;
+import net.minecraft.registry.Registries;
+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 static final Map<Block, Item> 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
+    );
+
+    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
+    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.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,
+                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.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,
+                    UItems.SWEET_APPLE_SEEDS, UItems.SWEET_APPLE,
+                UItems.TOAST, UItems.TOM, UItems.TURRET_SHELL,
+                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);
+        // 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);
+        // 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.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));
+        // 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));
+
+        // butterflies
+        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);
+        });
+
+        // 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/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..47b49e89
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/URecipeProvider.java
@@ -0,0 +1,87 @@
+package com.minelittlepony.unicopia.datagen.providers;
+
+import java.util.Arrays;
+import java.util.NoSuchElementException;
+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.RecipeExporter;
+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) {
+        super(output);
+    }
+
+    @Override
+    public void generate(RecipeExporter 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(RecipeExporter 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(RecipeExporter 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(RecipeExporter 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/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<Block, LootTable.Builder> 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/loot/UBlockLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockLootTableProvider.java
new file mode 100644
index 00000000..34db9593
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UBlockLootTableProvider.java
@@ -0,0 +1,132 @@
+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;
+
+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);
+    }
+
+    private 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/loot/UChestAdditionsLootTableProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java
new file mode 100644
index 00000000..72ad8a91
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/loot/UChestAdditionsLootTableProvider.java
@@ -0,0 +1,138 @@
+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<Identifier, Builder> exporter) {
+        acceptAdditions((id, builder) -> exporter.accept(new Identifier("unicopiamc", id.getPath()), builder));
+    }
+
+    public void acceptAdditions(BiConsumer<Identifier, Builder> 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.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.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.SHELLS).weight(8))
+        ));
+        exporter.accept(LootTables.UNDERWATER_RUIN_SMALL_CHEST, LootTable.builder().pool(LootPool.builder()
+                .rolls(UniformLootNumberProvider.create(1, 4))
+                .with(TagEntry.expandBuilder(UTags.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.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))
+        ));
+        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))
+        ));
+    }
+
+}
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/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/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java
index 5155a4cd..30334093 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.*;
@@ -67,19 +69,23 @@ public class ItemTracker implements NbtSerialisable, Copyable<ItemTracker>, Tick
 
     @Override
     public void tick() {
-        update(living, living.getArmourStacks());
+        update(living.getArmourStacks());
     }
 
-    private void update(Living<?> living, Stream<ItemStack> stacks) {
+    private void update(Stream<ItemStack> stacks) {
         final Set<Trackable> found = new HashSet<>();
         final Set<ItemStack> 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 +96,16 @@ public class ItemTracker implements NbtSerialisable, Copyable<ItemTracker>, 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/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
index 9d1c57e2..92b7ba95 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;
@@ -519,6 +521,10 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, 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<Entity>)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/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<String, Variant> 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/java/com/minelittlepony/unicopia/entity/mob/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
index 9bc17baa..924ca810 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java
@@ -4,6 +4,7 @@ import java.util.function.Predicate;
 
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.behaviour.EntityBehaviour;
+import com.minelittlepony.unicopia.projectile.MagicBeamEntity;
 import com.minelittlepony.unicopia.projectile.MagicProjectileEntity;
 import com.minelittlepony.unicopia.projectile.PhysicsBodyProjectileEntity;
 
@@ -32,7 +33,7 @@ public interface UEntities {
             .trackRangeBlocks(100)
             .trackedUpdateRate(2)
             .dimensions(EntityDimensions.fixed(0.25F, 0.25F)));
-    EntityType<MagicProjectileEntity> MAGIC_BEAM = register("magic_beam", FabricEntityTypeBuilder.<MagicProjectileEntity>create(SpawnGroup.MISC, MagicProjectileEntity::new)
+    EntityType<MagicBeamEntity> MAGIC_BEAM = register("magic_beam", FabricEntityTypeBuilder.<MagicBeamEntity>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/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/PlayerPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
index 6005489a..35116ead 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;
@@ -195,7 +196,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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;
         }
 
@@ -252,6 +253,10 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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;
@@ -343,7 +348,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
                 }
 
                 if (((LivingEntityDuck)entity).isJumping()) {
-                    velocity.y -= 0.2F * getGravitySignum();
+                    velocity.y -= 0.2F;
                     velocity.y /= 2F;
                 }
 
@@ -391,6 +396,10 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
             velocity.z /= heavyness;
         }
 
+        if (isGravityNegative()) {
+            velocity.y *= -1;
+        }
+
         entity.setVelocity(velocity.toImmutable());
 
         if (isFlying() && !entity.isFallFlying() && !pony.getAcrobatics().isHanging() && pony.isClient()) {
@@ -448,7 +457,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
             }
         }
 
-        velocity.y -= 0.02 * getGravitySignum();
+        velocity.y -= 0.02;
         velocity.x *= 0.9896;
         velocity.z *= 0.9896;
     }
@@ -541,7 +550,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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);
@@ -551,9 +560,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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;
@@ -635,6 +642,9 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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;
@@ -647,7 +657,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
             descentRate *= 0.8F;
         }
 
-        velocity.y -= descentRate * getGravityModifier();
+        velocity.y -= descentRate;
     }
 
     private void applyThrust(MutableVector velocity) {
@@ -695,7 +705,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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) {
@@ -759,9 +769,9 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> 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/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index 02c1d532..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<PlayerEntity> implements Copyable<Pony>, 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<String, Integer> advancementProgress = new HashMap<>();
 
@@ -129,6 +130,7 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
         addTicker(this::updateBatPonyAbilities);
         addTicker(this::updateCorruptionDecay);
         addTicker(new PlayerAttributes(this));
+        addTicker(corruptionHandler);
     }
 
     @Override
@@ -289,6 +291,10 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, Update
         return corruption;
     }
 
+    public CorruptionHandler getCorruptionhandler() {
+        return corruptionHandler;
+    }
+
     public boolean canUseSuperMove() {
         return entity.isCreative() || getMagicalReserves().getCharge().get() >= getMagicalReserves().getCharge().getMax();
     }
@@ -572,24 +578,7 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, 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();
-                }
-            }
-
-            if (entity.hurtTime == 1 && getCompositeRace().physical().canCast()) {
-                corruption.add(1);
-                setDirty();
-            }
-        }
     }
 
     @Override
@@ -789,6 +778,12 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, 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<Pony> partyMembers = FriendshipBraceletItem.getPartyMembers(this, 10).toList();
 
         if (!partyMembers.isEmpty()) {
@@ -956,10 +951,10 @@ public class Pony extends Living<PlayerEntity> implements Copyable<Pony>, 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..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
@@ -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/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/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<CloudBedBlock.SheetPattern, Item> ITEMS = new HashMap<>();
+    public static final Map<CloudBedBlock.SheetPattern, Item> ITEMS = new HashMap<>();
 
     private final CloudBedBlock.SheetPattern pattern;
 
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/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/java/com/minelittlepony/unicopia/item/URecipes.java b/src/main/java/com/minelittlepony/unicopia/item/URecipes.java
index 48d6f598..2ca593d1 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/URecipes.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/URecipes.java
@@ -54,11 +54,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(pool.entries);
+                        supplier.pool(pool);
                     }
-                });
+                } else {
+                    supplier.modifyPools(poolBuilder -> {
+                        for (var pool : table.pools) {
+                            poolBuilder.with(pool.entries);
+                        }
+                    });
+                }
             }
         });
     }
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<ItemStack> 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/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() { }
 
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 = "<clinit>()V", at = @At("RETURN"), remap = false)
+    private static void classInit() {
+        OxygenUtils.API = (OxygenUtils.OxygenApi)getAPI();
     }
 }
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<MsgPlayerFlightControlsInput> FLIGHT_CONTROLS_INPUT = SimpleNetworking.clientToServer(Unicopia.id("flight_controls"), MsgPlayerFlightControlsInput::new);
 
     S2CPacketType<MsgPlayerCapabilities> SERVER_PLAYER_CAPABILITIES = SimpleNetworking.serverToClient(Unicopia.id("player_capabilities"), MsgPlayerCapabilities::new);
-    S2CPacketType<MsgSpawnProjectile> SERVER_SPAWN_PROJECTILE = SimpleNetworking.serverToClient(Unicopia.id("projectile_entity"), MsgSpawnProjectile::new);
     S2CPacketType<MsgBlockDestruction> SERVER_BLOCK_DESTRUCTION = SimpleNetworking.serverToClient(Unicopia.id("block_destruction"), MsgBlockDestruction::new);
     S2CPacketType<MsgCancelPlayerAbility> CANCEL_PLAYER_ABILITY = SimpleNetworking.serverToClient(Unicopia.id("player_ability_cancel"), MsgCancelPlayerAbility::read);
     S2CPacketType<MsgCasterLookRequest> 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 33851b0c..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,31 +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>) entity).setMaster(world.getEntityById(packet.getEntityData()));
-        }
-
-        if (entity.getType() == UEntities.MAGIC_BEAM) {
-            InteractionManager.instance().playLoopingSound(entity, InteractionManager.SOUND_MAGIC_BEAM, entity.getId());
-        }
-
-        entity.onSpawnPacket(packet);
-        world.addEntity(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<MagicBeamEntity>, MagicImmune {
+    private static final TrackedData<Float> GRAVITY = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    private static final TrackedData<Boolean> HYDROPHOBIC = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
+    private static final TrackedData<NbtCompound> EFFECT = DataTracker.registerData(MagicBeamEntity.class, TrackedDataHandlerRegistry.NBT_COMPOUND);
+
+    private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
+
+    private final EntityPhysics<MagicProjectileEntity> physics = new EntityPhysics<>(this, GRAVITY);
+
+    public MagicBeamEntity(EntityType<MagicBeamEntity> 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 <T extends ProjectileDelegate> void forEachDelegates(Consumer<T> consumer, Function<Object, T> 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 8c8b09e7..3b8064ae 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,41 +24,28 @@ 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;
-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<MagicProjectileEntity>, WeaklyOwned.Mutable<LivingEntity>, MagicImmune {
+public class MagicProjectileEntity extends ThrownItemEntity implements WeaklyOwned.Mutable<LivingEntity> {
     private static final TrackedData<Float> DAMAGE = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.FLOAT);
-    private static final TrackedData<Float> GRAVITY = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.FLOAT);
-    private static final TrackedData<Boolean> HYDROPHOBIC = DataTracker.registerData(MagicProjectileEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
-    private static final TrackedData<NbtCompound> 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<MagicProjectileEntity> physics = new EntityPhysics<>(this, GRAVITY);
-
     private final EntityReference<Entity> homingTarget = new EntityReference<>();
     private EntityReference<LivingEntity> owner;
 
     private int maxAge = 90;
 
-    public MagicProjectileEntity(EntityType<MagicProjectileEntity> type, World world) {
+    public MagicProjectileEntity(EntityType<? extends MagicProjectileEntity> type, World world) {
         super(type, world);
     }
 
@@ -86,27 +57,24 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         super(UEntities.THROWN_ITEM, thrower, world);
     }
 
+    protected MagicProjectileEntity(EntityType<? extends MagicProjectileEntity> 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 +108,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         homingTarget.set(target);
     }
 
-    @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();
-    }
-
     public void addThrowDamage(float damage) {
         setThrowDamage(getThrowDamage() + damage);
     }
@@ -182,14 +120,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         return getDataTracker().get(DAMAGE);
     }
 
-    public void setHydrophobic() {
-        getDataTracker().set(HYDROPHOBIC, true);
-    }
-
-    public boolean getHydrophobic() {
-        return getDataTracker().get(HYDROPHOBIC);
-    }
-
     public void setMaxAge(int maxAge) {
         this.maxAge = maxAge;
     }
@@ -202,28 +132,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
 
         super.tick();
 
-        if (getOwner() == null) {
-            return;
-        }
-
-        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));
-            }
-        }
-
         homingTarget.ifPresent(getWorld(), e -> {
             setNoGravity(true);
             noClip = true;
@@ -261,12 +169,8 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     @Override
     public void readCustomDataFromNbt(NbtCompound compound) {
         super.readCustomDataFromNbt(compound);
-        physics.fromNBT(compound);
         homingTarget.fromNBT(compound.getCompound("homingTarget"));
         getMasterReference().fromNBT(compound.getCompound("owner"));
-        if (compound.contains("effect")) {
-            getSpellSlot().put(Spell.readNbt(compound.getCompound("effect")));
-        }
         if (compound.contains("maxAge", NbtElement.INT_TYPE)) {
             maxAge = compound.getInt("maxAge");
         }
@@ -275,13 +179,9 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     @Override
     public void writeCustomDataToNbt(NbtCompound compound) {
         super.writeCustomDataToNbt(compound);
-        physics.toNBT(compound);
         compound.put("homingTarget", homingTarget.toNBT());
         compound.put("owner", getMasterReference().toNBT());
         compound.putInt("maxAge", maxAge);
-        getSpellSlot().get(true).ifPresent(effect -> {
-            compound.put("effect", Spell.writeNbt(effect));
-        });
     }
 
     @Override
@@ -296,12 +196,6 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         }
     }
 
-    @Override
-    public void remove(RemovalReason reason) {
-        super.remove(reason);
-        getSpellSlot().clear();
-    }
-
     @Override
     protected void onBlockHit(BlockHitResult hit) {
         super.onBlockHit(hit);
@@ -313,7 +207,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     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;
         }
 
@@ -329,20 +223,10 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     }
 
     protected <T extends ProjectileDelegate> void forEachDelegates(Consumer<T> consumer, Function<Object, T> 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);
         }
     }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Packet<ClientPlayPacketListener> createSpawnPacket() {
-        return (Packet<ClientPlayPacketListener>)(Object)Channel.SERVER_SPAWN_PROJECTILE.toPacket(new MsgSpawnProjectile(this));
-    }
 }
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;
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<E extends Entity> extends EntityConvertable<E> {
     }
 
     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) {
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.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_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/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/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/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.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_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_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_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_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_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/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_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/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_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_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/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/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/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/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.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/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/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/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/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_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/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.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_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_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/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/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.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_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/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/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/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/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/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/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/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_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_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/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/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/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/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_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_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/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/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/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/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/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/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/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_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_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/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/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/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/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_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/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_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/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/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/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json
index 525c448b..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",
@@ -622,6 +623,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",
@@ -1307,16 +1311,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",
@@ -1533,6 +1548,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/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": "Магическое гудение",
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",
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/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/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.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_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/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/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/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.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_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_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_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_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_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/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_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_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/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/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/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_left.json
similarity index 96%
rename from src/main/resources/assets/unicopia/models/block/door/top.json
rename to src/main/resources/assets/unicopia/models/block/door_left.json
index 77b93084..6c5b0b27 100644
--- a/src/main/resources/assets/unicopia/models/block/door/top.json
+++ b/src/main/resources/assets/unicopia/models/block/door_left.json
@@ -12,7 +12,7 @@
                 "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" }
+                "east":  { "uv": [ 16, 0,  0, 16 ], "texture": "#top", "cullface": "east" }
             }
         }
     ]
diff --git a/src/main/resources/assets/unicopia/models/block/door/top_rh.json b/src/main/resources/assets/unicopia/models/block/door_right.json
similarity index 96%
rename from src/main/resources/assets/unicopia/models/block/door/top_rh.json
rename to src/main/resources/assets/unicopia/models/block/door_right.json
index 9bea9d05..bf096276 100644
--- a/src/main/resources/assets/unicopia/models/block/door/top_rh.json
+++ b/src/main/resources/assets/unicopia/models/block/door_right.json
@@ -12,7 +12,7 @@
                 "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" }
+                "east":  { "uv": [  0, 0, 16, 16 ], "texture": "#top", "cullface": "east" }
             }
         }
     ]
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/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_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 91%
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
index 37d5bc25..558d91f9 100644
--- 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
@@ -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_cloud_corner_x.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_x.json
similarity index 90%
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
index 23277ae2..42dbd2e9 100644
--- 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
@@ -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_cloud_corner_xy.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xy.json
similarity index 90%
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
index 6e072670..3e38a952 100644
--- 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
@@ -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_cloud_corner_xyz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xyz.json
similarity index 90%
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
index 56bd77f6..a49dcfa1 100644
--- 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
@@ -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_cloud_corner_xz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_xz.json
similarity index 90%
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
index de17ffca..e1f8d024 100644
--- 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
@@ -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_cloud_corner_y.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_y.json
similarity index 90%
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
index 12905fcc..d4339052 100644
--- 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
@@ -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_cloud_corner_yz.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_yz.json
similarity index 90%
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
index c9b9377a..3df63176 100644
--- 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
@@ -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_cloud_corner_z.json b/src/main/resources/assets/unicopia/models/block/flattened_corner_z.json
similarity index 90%
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
index b263136e..233d45c8 100644
--- 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
@@ -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_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/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/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/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_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/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/hay_bale_bne.json b/src/main/resources/assets/unicopia/models/block/hay_bale_bne.json
deleted file mode 100644
index 7453b2e9..00000000
--- a/src/main/resources/assets/unicopia/models/block/hay_bale_bne.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"textures": {
-		"top": "block/hay_block_top",
-		"particle": "block/hay_block_side",
-		"side": "block/hay_block_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"}
-      }
-    }
-	]
-}
\ 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/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/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/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/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/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/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/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/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_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_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/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/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/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/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_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/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/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/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/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/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/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_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/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/template_bale_bne.json b/src/main/resources/assets/unicopia/models/block/template_bale_bne.json
new file mode 100644
index 00000000..8d57a7cc
--- /dev/null
+++ b/src/main/resources/assets/unicopia/models/block/template_bale_bne.json
@@ -0,0 +1,20 @@
+{
+	"textures": {
+		"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"}
+        }
+      }
+	]
+}
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 83%
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
index 6cde59a7..b6928949 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_bse.json b/src/main/resources/assets/unicopia/models/block/template_bale_bse.json
similarity index 81%
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
index 76ec139b..2d197ff6 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_bsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_bsw.json
similarity index 82%
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
index ed4ade6d..4a2b5049 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_tne.json b/src/main/resources/assets/unicopia/models/block/template_bale_tne.json
similarity index 82%
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
index d23896b4..1aead478 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_tnw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tnw.json
similarity index 80%
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
index b465617c..1726640d 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_tse.json b/src/main/resources/assets/unicopia/models/block/template_bale_tse.json
similarity index 82%
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
index 64d34fa6..b54a8072 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/hay_bale_tsw.json b/src/main/resources/assets/unicopia/models/block/template_bale_tsw.json
similarity index 82%
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
index 01f205b0..0f506d53 100644
--- a/src/main/resources/assets/unicopia/models/block/hay_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/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/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/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/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_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/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/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/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/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/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.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/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/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/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/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/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/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_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/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/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/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
deleted file mode 100644
index 5d06b91c..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:item/white_wool"
-    }
-}
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_bed.json b/src/main/resources/assets/unicopia/models/item/cloud_bed.json
deleted file mode 100644
index 5d06b91c..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": "minecraft:item/white_wool"
-    }
-}
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_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_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_chest.json b/src/main/resources/assets/unicopia/models/item/cloud_chest.json
deleted file mode 100644
index 74aedb05..00000000
--- a/src/main/resources/assets/unicopia/models/item/cloud_chest.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "parent": "minecraft:item/chest",
-    "textures": {
-        "particle": "minecraft:item/white_wool"
-    }
-}
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_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
deleted file mode 100644
index 2bbe230b..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": "unicopia:block/cloud_pillar_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/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_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_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/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/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_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/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/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/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/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/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/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/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/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/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/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_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/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_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/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_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/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/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/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/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/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/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/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/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/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_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/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.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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.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_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/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/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/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/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/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_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/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/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/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/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/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/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/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/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_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/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/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/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/mug.json b/src/main/resources/assets/unicopia/models/item/template_mug.json
similarity index 92%
rename from src/main/resources/assets/unicopia/models/item/mug.json
rename to src/main/resources/assets/unicopia/models/item/template_mug.json
index 78012844..048e6f8f 100644
--- a/src/main/resources/assets/unicopia/models/item/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/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/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/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/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/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/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/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/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/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/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_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/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/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/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",
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/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/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
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/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
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/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/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/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
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
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/assets/unicopia/textures/item/cloud_door.png b/src/main/resources/assets/unicopia/textures/item/cloud_door.png
index c7839077..423f8397 100644
Binary files a/src/main/resources/assets/unicopia/textures/item/cloud_door.png and b/src/main/resources/assets/unicopia/textures/item/cloud_door.png differ
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 96e93768..514d0827 100644
Binary files a/src/main/resources/assets/unicopia/textures/item/crystal_door.png and b/src/main/resources/assets/unicopia/textures/item/crystal_door.png differ
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
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 6cd22ee2..00000000
--- a/src/main/resources/data/c/tags/items/fruits.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "unicopia:mango",
-    "unicopia:banana",
-    "unicopia:pineapple"
-  ]
-}
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/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/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/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/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/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..c91d791e 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,20 @@
       "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"
+      ],
+      "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/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/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
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
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/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/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/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"
-  ]
-}
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/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..39c40cdc
--- /dev/null
+++ b/src/main/resources/data/unicopia/tags/items/food_types/fruit.json
@@ -0,0 +1,19 @@
+{
+  "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 },
+    { "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
new file mode 100644
index 00000000..937e7578
--- /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", "required": false },
+    { "id": "#garnished:nut_mix", "required": false },
+    { "id": "#garnished:neverable_delecacies", "required": false }
+  ]
+}
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/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/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/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/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/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"
-  ]
-}
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"
-  ]
-}
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"
-  ]
-}
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
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"
     ],