diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 75%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index 257db1a9..f42641fb 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.util.math.BlockPos;
@@ -7,8 +7,8 @@
 import java.util.Iterator;
 
 public class BiomeColors {
-    private static final ColorProvider GRASS_COLOR = (biome, pos) -> biome.getGrassColor(pos);
-    private static final ColorProvider FOLIAGE_COLOR = (biome, pos) -> biome.getFoliageColor(pos);
+    private static final ColorProvider GRASS_COLOR = Biome::getGrassColor;
+    private static final ColorProvider FOLIAGE_COLOR = Biome::getFoliageColor;
     private static final ColorProvider WATER_COLOR = (biome, pos) -> biome.getWaterColor();
 
     private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider provider) {
@@ -17,7 +17,7 @@ private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider pro
         int k = 0;
 
         int l;
-        for (Iterator iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
+        for (Iterator<BlockPos.Mutable> iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
             BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next();
             l = provider.getColorAtPos(view.getBiome(mutable), mutable);
             i += (l & 16711680) >> 16;
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
similarity index 84%
rename from 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
index 3e3e044c..b6819227 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.BlockState;
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
similarity index 84%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
index 4df7551c..2bd090ca 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.*;
@@ -19,7 +19,7 @@ public BlockColors() {
     public static BlockColors create() {
         final BlockColors blockColors = new BlockColors();
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            DoublePlantBlock.DoublePlantType doublePlantType = (DoublePlantBlock.DoublePlantType) blockState.get(DoublePlantBlock.VARIANT);
+            DoublePlantBlock.DoublePlantType doublePlantType = blockState.get(DoublePlantBlock.VARIANT);
             return blockView == null || blockPos == null || doublePlantType != DoublePlantBlock.DoublePlantType.GRASS && doublePlantType != DoublePlantBlock.DoublePlantType.FERN ? -1 : BiomeColors.getGrassColor(blockView, blockPos);
         }, Blocks.DOUBLE_PLANT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
@@ -38,7 +38,7 @@ public static BlockColors create() {
         }, Blocks.FLOWER_POT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : GrassColors.getColor(0.5D, 1.0D), Blocks.GRASS);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            PlanksBlock.WoodType woodType = (PlanksBlock.WoodType) blockState.get(Leaves1Block.VARIANT);
+            PlanksBlock.WoodType woodType = blockState.get(Leaves1Block.VARIANT);
             if (woodType == PlanksBlock.WoodType.SPRUCE) {
                 return FoliageColors.getSpruceColor();
             } else if (woodType == PlanksBlock.WoodType.BIRCH) {
@@ -49,10 +49,10 @@ public static BlockColors create() {
         }, Blocks.LEAVES);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.LEAVES2);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getWaterColor(blockView, blockPos) : -1, Blocks.WATER, Blocks.FLOWING_WATER);
-        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877((Integer) blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877(blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : -1, Blocks.SUGARCANE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            int j = (Integer) blockState.get(AttachedStemBlock.AGE);
+            int j = blockState.get(AttachedStemBlock.AGE);
             int k = j * 32;
             int l = 255 - j * 8;
             int m = j * 4;
@@ -71,9 +71,9 @@ public static BlockColors create() {
     }
 
     public int method_13410(BlockState blockState) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         if (blockColorable != null) {
-            return blockColorable.method_12155(blockState, (EmptyBlockView) null, (BlockPos) null, 0);
+            return blockColorable.method_12155(blockState, null, null, 0);
         } else {
             MaterialColor materialColor = blockState.getMaterialColor();
             return materialColor != null ? materialColor.color : -1;
@@ -81,15 +81,14 @@ public int method_13410(BlockState blockState) {
     }
 
     public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         return blockColorable == null ? -1 : blockColorable.method_12155(blockState, blockView, blockPos, i);
     }
 
     public void method_12158(BlockColorable blockColorable, Block... blocks) {
         int i = blocks.length;
 
-        for (int j = 0; j < i; ++j) {
-            Block block = blocks[j];
+        for (Block block : blocks) {
             this.BlockColor2Id.set(blockColorable, Block.getIdByBlock(block));
         }
 
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 78%
rename from 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 8c32f48f..b63e543b 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
@@ -30,8 +30,8 @@ public static int getDefaultColor() {
     }
 
     public static int getFoliageColor(Biome biome) {
-        double d = (double) MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return FoliageColors.getColor(d, e);
     }
 }
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 74%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 88687071..afee2b70 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
@@ -19,8 +19,8 @@ public static int getColor(double temperature, double humidity) {
     }
 
     public static int getGrassColor(Biome biome) {
-        double d = (double) MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return GrassColors.getColor(d, e);
     }
 }
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index 1572a082..75c9f89c 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index b2789fd0..2bb5a0be 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -96,31 +96,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index 5828f9e9..3703b843 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -55,7 +55,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -65,7 +65,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index a4f970c9..8d1b2a84 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -3,10 +3,10 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 74%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index 9bee1854..eb56ce44 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.util.math.BlockPos;
@@ -9,13 +9,13 @@
 
 public class BiomeColors {
     private static final ColorProvider GRASS_COLOR = (biome, pos) -> {
-        double d = (double) MathHelper.clamp(biome.getTemperature(pos), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(pos), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return GrassColors.getColor(d, e);
     };
     private static final ColorProvider FOLIAGE_COLOR = (biome, pos) -> {
-        double d = (double) MathHelper.clamp(biome.getTemperature(pos), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(pos), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return FoliageColors.getColor(d, e);
     };
     private static final ColorProvider WATER_COLOR = (biome, pos) -> biome.getWaterColor();
@@ -26,7 +26,7 @@ private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider pro
         int k = 0;
 
         int l;
-        for (Iterator var6 = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); var6.hasNext(); k += l & 255) {
+        for (Iterator<BlockPos.Mutable> var6 = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); var6.hasNext(); k += l & 255) {
             BlockPos.Mutable mutable = (BlockPos.Mutable) var6.next();
             l = provider.getColorAtPos(view.getBiome(mutable), mutable);
             i += (l & 16711680) >> 16;
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
similarity index 84%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
index 3e3e044c..b6819227 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.BlockState;
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
similarity index 85%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
index 773f95fe..5053ac73 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.*;
@@ -18,7 +18,7 @@ public BlockColors() {
     public static BlockColors create() {
         final BlockColors blockColors = new BlockColors();
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            DoublePlantBlock.DoublePlantType doublePlantType = (DoublePlantBlock.DoublePlantType) blockState.get(DoublePlantBlock.VARIANT);
+            DoublePlantBlock.DoublePlantType doublePlantType = blockState.get(DoublePlantBlock.VARIANT);
             return blockView != null && blockPos != null && (doublePlantType == DoublePlantBlock.DoublePlantType.GRASS || doublePlantType == DoublePlantBlock.DoublePlantType.FERN) ? BiomeColors.getGrassColor(blockView, blockState.get(DoublePlantBlock.HALF) == DoublePlantBlock.HalfType.UPPER ? blockPos.down() : blockPos) : -1;
         }, Blocks.DOUBLE_PLANT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
@@ -37,7 +37,7 @@ public static BlockColors create() {
         }, Blocks.FLOWER_POT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : GrassColors.getColor(0.5D, 1.0D), Blocks.GRASS);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            PlanksBlock.WoodType woodType = (PlanksBlock.WoodType) blockState.get(Leaves1Block.VARIANT);
+            PlanksBlock.WoodType woodType = blockState.get(Leaves1Block.VARIANT);
             if (woodType == PlanksBlock.WoodType.SPRUCE) {
                 return net.minecraft.client.color.world.FoliageColors.getSpruceColor();
             } else if (woodType == PlanksBlock.WoodType.BIRCH) {
@@ -48,10 +48,10 @@ public static BlockColors create() {
         }, Blocks.LEAVES);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.LEAVES2);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getWaterColor(blockView, blockPos) : -1, Blocks.WATER, Blocks.FLOWING_WATER);
-        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877((Integer) blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877(blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : -1, Blocks.SUGARCANE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            int j = (Integer) blockState.get(AttachedStemBlock.AGE);
+            int j = blockState.get(AttachedStemBlock.AGE);
             int k = j * 32;
             int l = 255 - j * 8;
             int m = j * 4;
@@ -70,9 +70,9 @@ public static BlockColors create() {
     }
 
     public int method_13410(BlockState blockState) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         if (blockColorable != null) {
-            return blockColorable.method_12155(blockState, null, (BlockPos) null, 0);
+            return blockColorable.method_12155(blockState, null, null, 0);
         } else {
             MaterialColor materialColor = blockState.getMaterialColor();
             return materialColor != null ? materialColor.color : -1;
@@ -80,15 +80,14 @@ public int method_13410(BlockState blockState) {
     }
 
     public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         return blockColorable == null ? -1 : blockColorable.method_12155(blockState, blockView, blockPos, i);
     }
 
     public void method_12158(BlockColorable blockColorable, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.BlockColor2Id.set(blockColorable, Block.getIdByBlock(block));
         }
 
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 91%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index d728f58f..f4d20ec2 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 public class FoliageColors {
     private static int[] colorMap = new int[65536];
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 88%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 2e828e1c..0528f394 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 public class GrassColors {
     private static int[] colorMap = new int[65536];
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index 1572a082..75c9f89c 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/SkyColor.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java
similarity index 97%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/SkyColor.java
rename to 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java
index 033a11ca..fd0b7ae7 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/SkyColor.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
index 893c26c5..1453aa27 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
@@ -2,7 +2,7 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.SkyColor;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.SkyColor;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.SimpleRegistry;
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index fe814585..47cac43b 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -93,31 +93,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index cb4b58b6..b1b24cf8 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -49,7 +49,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -59,7 +59,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index ce9c0ee9..401c2c5a 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -3,9 +3,9 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BiomeColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BiomeColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 79%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index e4070ada..874569b3 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
@@ -7,8 +7,8 @@
 import java.util.Iterator;
 
 public class BiomeColors {
-    private static final ColorProvider GRASS_COLOR = (biome, pos) -> biome.getGrassColor(pos);
-    private static final ColorProvider FOLIAGE_COLOR = (biome, pos) -> biome.getFoliageColor(pos);
+    private static final ColorProvider GRASS_COLOR = Biome::getGrassColor;
+    private static final ColorProvider FOLIAGE_COLOR = Biome::getFoliageColor;
     private static final ColorProvider WATER_COLOR = (biome, pos) -> biome.getWaterColor();
 
     private static int getColor(BlockView view, BlockPos pos, ColorProvider provider) {
@@ -18,7 +18,7 @@ private static int getColor(BlockView view, BlockPos pos, ColorProvider provider
 
         int l;
         for (Iterator<BlockPos.Mutable> var6 = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); var6.hasNext(); k += l & 255) {
-            BlockPos.Mutable mutable = (BlockPos.Mutable) var6.next();
+            BlockPos.Mutable mutable = var6.next();
             l = provider.getColorAtPos(view.getBiome(mutable), mutable);
             i += (l & 16711680) >> 16;
             j += (l & '\uff00') >> 8;
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
similarity index 83%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
index d1443853..64809900 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
similarity index 95%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
index a18847ac..51bf78c8 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
@@ -51,7 +51,7 @@ public static BlockColors create() {
         }, Blocks.LEAVES);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.LEAVES2);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getWaterColor(blockView, blockPos) : -1, Blocks.WATER, Blocks.FLOWING_WATER);
-        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877((Integer) blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877(blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : -1, Blocks.SUGARCANE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
             int j = blockState.get(AttachedStemBlock.AGE);
@@ -91,8 +91,7 @@ public int method_12157(BlockState blockState, @Nullable BlockView blockView, @N
     public void method_12158(BlockColorable blockColorable, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.BlockColor2Id.set(blockColorable, Block.getIdByBlock(block));
         }
     }
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 9a7ad297..1d3f9480 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index d6fe5bd7..9d653723 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index c6b2943e..f733e90f 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index 1036d62c..f6870455 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -95,31 +95,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index 0b375d55..5528e0b7 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -55,7 +55,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -65,7 +65,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index 146afba4..72c79511 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -2,10 +2,10 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.DGU;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 97%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index a6105512..a661211e 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.math.BlockPos;
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
similarity index 83%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
index 280d2eeb..f6baf129 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
similarity index 96%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
index eec0c8e1..a372bf64 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.block.*;
 import net.minecraft.class_2181;
@@ -56,8 +56,7 @@ public int method_18332(BlockState blockState, @Nullable RenderBlockView renderB
     public void method_12158(BlockColorable blockColorable, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.BlockColor2Id.set(blockColorable, Registry.BLOCK.getRawId(block));
         }
 
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 9a7ad297..1d3f9480 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index d6fe5bd7..9d653723 100644
--- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index c6b2943e..f733e90f 100644
--- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
index 133b8ef0..1de3cf31 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
@@ -13,12 +13,11 @@
 public class BiomesDataGenerator implements IDataGenerator {
 
     private static String guessBiomeDimensionFromCategory(Biome biome) {
-        String category = switch (biome.getCategory()) {
+        return switch (biome.getCategory()) {
             case NETHER -> "nether";
             case THEEND -> "end";
             default -> "overworld";
         };
-        return category;
     }
 
     private static int getBiomeColorFor(String biomeName) {
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index f56096df..d2db88de 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -77,7 +77,7 @@ private static String getCategoryFrom(@NotNull EntityType<?> entityType) {
         if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities
         Class<? extends Entity> entityClazz = getEntityClass(entityType);
         String packageName = entityClazz.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -87,7 +87,6 @@ private static String getCategoryFrom(@NotNull EntityType<?> entityType) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index a6bd0635..07935d7f 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -2,10 +2,10 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.util.DGU;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 97c57352..f1068ebd 100644
--- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index ff1ce7b1..91270912 100644
--- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index c6b2943e..f733e90f 100644
--- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index 754d7dbf..8ae3fdad 100644
--- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -2,9 +2,9 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.util.DGU;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.FabricLoader;
diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 97c57352..f1068ebd 100644
--- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 300131c1..ee6a498a 100644
--- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 94%
rename from 1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index c9b29873..5a21ac15 100644
--- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.util.math.MathHelper;
diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index a9b7788d..07926410 100644
--- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -2,9 +2,9 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 97c57352..f1068ebd 100644
--- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 8273ed57..9452d37a 100644
--- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 94%
rename from 1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index c9b29873..5a21ac15 100644
--- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.util.math.MathHelper;
diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index 3d0a895d..f480e930 100644
--- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -2,9 +2,9 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeEffectsAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView;
 import net.fabricmc.api.EnvType;
diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
index 2107780e..e8430ebe 100644
--- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
+++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
@@ -34,12 +34,12 @@ public static BlockColors create() {
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getBirchColor(), Blocks.BIRCH_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor(), Blocks.OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.VINE, Blocks.MANGROVE_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getWaterColor(world, pos) : -1, Blocks.WATER, Blocks.BUBBLE_COLUMN, Blocks.WATER_CAULDRON);
-        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor((Integer) state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor(state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.registerColorProperty(RedstoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : -1, Blocks.SUGAR_CANE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> {
-            int i = (Integer) state.get(StemBlock.AGE);
+            int i = state.get(StemBlock.AGE);
             int j = i * 32;
             int k = 255 - i * 8;
             int l = i * 4;
@@ -51,9 +51,9 @@ public static BlockColors create() {
     }
 
     public int getParticleColor(BlockState state, World world, BlockPos pos) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
         if (blockColorProvider != null) {
-            return blockColorProvider.getColor(state, (BlockRenderView) null, (BlockPos) null, 0);
+            return blockColorProvider.getColor(state, null, null, 0);
         } else {
             MapColor mapColor = state.getMapColor(world, pos);
             return mapColor != null ? mapColor.color : -1;
@@ -61,15 +61,14 @@ public int getParticleColor(BlockState state, World world, BlockPos pos) {
     }
 
     public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
         return blockColorProvider == null ? -1 : blockColorProvider.getColor(state, world, pos, tintIndex);
     }
 
     public void registerColorProvider(BlockColorProvider provider, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.providers.set(provider, Registry.BLOCK.getRawId(block));
         }
 
@@ -78,8 +77,7 @@ public void registerColorProvider(BlockColorProvider provider, Block... blocks)
     private void registerColorProperties(Set<Property<?>> properties, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.properties.put(block, properties);
         }
 
@@ -90,6 +88,6 @@ private void registerColorProperty(Property<?> property, Block... blocks) {
     }
 
     public Set<Property<?>> getProperties(Block block) {
-        return (Set) this.properties.getOrDefault(block, ImmutableSet.of());
+        return this.properties.getOrDefault(block, ImmutableSet.of());
     }
 }
diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
index 2107780e..e8430ebe 100644
--- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
+++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
@@ -34,12 +34,12 @@ public static BlockColors create() {
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getBirchColor(), Blocks.BIRCH_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor(), Blocks.OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.VINE, Blocks.MANGROVE_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getWaterColor(world, pos) : -1, Blocks.WATER, Blocks.BUBBLE_COLUMN, Blocks.WATER_CAULDRON);
-        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor((Integer) state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor(state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.registerColorProperty(RedstoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : -1, Blocks.SUGAR_CANE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> {
-            int i = (Integer) state.get(StemBlock.AGE);
+            int i = state.get(StemBlock.AGE);
             int j = i * 32;
             int k = 255 - i * 8;
             int l = i * 4;
@@ -51,9 +51,9 @@ public static BlockColors create() {
     }
 
     public int getParticleColor(BlockState state, World world, BlockPos pos) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
         if (blockColorProvider != null) {
-            return blockColorProvider.getColor(state, (BlockRenderView) null, (BlockPos) null, 0);
+            return blockColorProvider.getColor(state, null, null, 0);
         } else {
             MapColor mapColor = state.getMapColor(world, pos);
             return mapColor != null ? mapColor.color : -1;
@@ -61,15 +61,14 @@ public int getParticleColor(BlockState state, World world, BlockPos pos) {
     }
 
     public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock()));
         return blockColorProvider == null ? -1 : blockColorProvider.getColor(state, world, pos, tintIndex);
     }
 
     public void registerColorProvider(BlockColorProvider provider, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.providers.set(provider, Registry.BLOCK.getRawId(block));
         }
 
@@ -78,8 +77,7 @@ public void registerColorProvider(BlockColorProvider provider, Block... blocks)
     private void registerColorProperties(Set<Property<?>> properties, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.properties.put(block, properties);
         }
 
@@ -90,6 +88,6 @@ private void registerColorProperty(Property<?> property, Block... blocks) {
     }
 
     public Set<Property<?>> getProperties(Block block) {
-        return (Set) this.properties.getOrDefault(block, ImmutableSet.of());
+        return this.properties.getOrDefault(block, ImmutableSet.of());
     }
 }
diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a015cc4f..6bd50d74 100644
--- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -76,7 +76,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {
diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
index 368da7f4..a0a3bdf8 100644
--- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
+++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java
@@ -35,12 +35,12 @@ public static BlockColors create() {
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getBirchColor(), Blocks.BIRCH_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefaultColor(), Blocks.OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.VINE, Blocks.MANGROVE_LEAVES);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getWaterColor(world, pos) : -1, Blocks.WATER, Blocks.BUBBLE_COLUMN, Blocks.WATER_CAULDRON);
-        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor((Integer) state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor(state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.registerColorProperty(RedstoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : -1, Blocks.SUGAR_CANE);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
         blockColors.registerColorProvider((state, world, pos, tintIndex) -> {
-            int i = (Integer) state.get(StemBlock.AGE);
+            int i = state.get(StemBlock.AGE);
             int j = i * 32;
             int k = 255 - i * 8;
             int l = i * 4;
@@ -52,9 +52,9 @@ public static BlockColors create() {
     }
 
     public int getParticleColor(BlockState state, World world, BlockPos pos) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock()));
         if (blockColorProvider != null) {
-            return blockColorProvider.getColor(state, (BlockRenderView) null, (BlockPos) null, 0);
+            return blockColorProvider.getColor(state, null, null, 0);
         } else {
             MapColor mapColor = state.getMapColor(world, pos);
             return mapColor != null ? mapColor.color : -1;
@@ -62,15 +62,14 @@ public int getParticleColor(BlockState state, World world, BlockPos pos) {
     }
 
     public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) {
-        BlockColorProvider blockColorProvider = (BlockColorProvider) this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock()));
+        BlockColorProvider blockColorProvider = this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock()));
         return blockColorProvider == null ? -1 : blockColorProvider.getColor(state, world, pos, tintIndex);
     }
 
     public void registerColorProvider(BlockColorProvider provider, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.providers.set(provider, DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(block));
         }
 
@@ -79,8 +78,7 @@ public void registerColorProvider(BlockColorProvider provider, Block... blocks)
     private void registerColorProperties(Set<Property<?>> properties, Block... blocks) {
         int var4 = blocks.length;
 
-        for (int var5 = 0; var5 < var4; ++var5) {
-            Block block = blocks[var5];
+        for (Block block : blocks) {
             this.properties.put(block, properties);
         }
 
@@ -91,6 +89,6 @@ private void registerColorProperty(Property<?> property, Block... blocks) {
     }
 
     public Set<Property<?>> getProperties(Block block) {
-        return (Set) this.properties.getOrDefault(block, ImmutableSet.of());
+        return this.properties.getOrDefault(block, ImmutableSet.of());
     }
 }
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
similarity index 98%
rename from 1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java
rename to 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
index 7ea5ca90..c032c331 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.block.*;
 import net.minecraft.world.biome.Biome;
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 93%
rename from 1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index bb71f227..b5538a62 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 9841e737..0ca9862a 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index 1572a082..75c9f89c 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index 8cbef351..b2d77af7 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -111,31 +111,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
+
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
-
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index 6db70ce8..ebfcf936 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -54,7 +54,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -64,7 +64,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index fdb342fb..414749bb 100644
--- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -3,9 +3,9 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BiomeBlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BiomeBlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
 import dev.u9g.minecraftdatagenerator.mixin.accessor.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
similarity index 96%
rename from 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java
rename to 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
index e860bb9d..ee0d2201 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeBlockColors.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.*;
@@ -46,7 +46,7 @@ public BlockState getBlockState(BlockPos pos) {
         } else if (block instanceof SugarCaneBlock || block instanceof TallPlantBlock) {
             return GrassColors.getGrassColor(EmptyBlockView.INSTANCE.getBiome(BlockPos.ORIGIN));
         } else if (block instanceof VineBlock) {
-            return dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors.getFoliageColor(EmptyBlockView.INSTANCE.getBiome(BlockPos.ORIGIN));
+            return dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors.getFoliageColor(EmptyBlockView.INSTANCE.getBiome(BlockPos.ORIGIN));
         }
         return 0xFFFFFF;
     }
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 75%
rename from 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index 3b020082..fca5440a 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
@@ -7,8 +7,8 @@
 import java.util.Iterator;
 
 public class BiomeColors {
-    private static final ColorProvider GRASS_COLOR = (biome, pos) -> biome.getGrassColor(pos);
-    private static final ColorProvider FOLIAGE_COLOR = (biome, pos) -> biome.getFoliageColor(pos);
+    private static final ColorProvider GRASS_COLOR = Biome::getGrassColor;
+    private static final ColorProvider FOLIAGE_COLOR = Biome::getFoliageColor;
     private static final ColorProvider WATER_COLOR = (biome, pos) -> biome.waterColor;
 
     private static int getColor(BlockView view, BlockPos pos, ColorProvider provider) {
@@ -17,7 +17,7 @@ private static int getColor(BlockView view, BlockPos pos, ColorProvider provider
         int k = 0;
 
         int l;
-        for (Iterator iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
+        for (Iterator<BlockPos.Mutable> iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
             BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next();
             l = provider.getColorAtPos(view.getBiome(mutable), mutable);
             i += (l & 16711680) >> 16;
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 94%
rename from 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index c137d32d..1a55df05 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 92%
rename from 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 112d816c..ff015f9a 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
similarity index 92%
rename from 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
rename to 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
index 1572a082..75c9f89c 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index 6d025605..38ec86b6 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -96,31 +96,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index 7ade8308..e0e9e745 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -55,7 +55,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -65,7 +65,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index c69b3cb6..4412712d 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -3,10 +3,10 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BiomeBlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BiomeBlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java
index 8290f2b2..4bf760f8 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java
@@ -8,9 +8,12 @@
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(CocoaBlock.class)
 public class CocoaBlockOverwrite {
+    @Unique
+    @Unique
     private static Box collisionBox(BlockState state) {
         Direction direction = state.get(CocoaBlock.FACING);
         int i = state.get(CocoaBlock.AGE);
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java
index 538eba50..97e8fb72 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java
@@ -6,9 +6,12 @@
 import net.minecraft.util.math.Box;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(SkeletonSkullBlock.class)
 public class SkeletonSkullBlockOverwrite {
+    @Unique
+    @Unique
     private static Box boundingBox(BlockState state) {
         return switch (state.get(SkeletonSkullBlock.FACING)) {
             default -> new Box(0.25f, 0.0f, 0.25f, 0.75f, 0.5f, 0.75f);
@@ -19,6 +22,8 @@ private static Box boundingBox(BlockState state) {
         };
     }
 
+    @Unique
+    @Unique
     public Box getCollisionBox(World world, BlockPos pos, BlockState state) {
         return boundingBox(state);
     }
diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java
index bf64f53e..2da77868 100644
--- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java
+++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java
@@ -14,6 +14,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 
 import java.util.List;
 
@@ -53,6 +54,7 @@ public BlockState getBlockState(BlockPos pos) {
         this.setBoundingBox(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f);
     }
 
+    @Unique
     public Box someFuncThatIRemade(BlockState state) {
         if (state.get(HALF) == StairsBlock.Half.TOP) {
             return new Box(0.0f, 0.5f, 0.0f, 1.0f, 1.0f, 1.0f);
@@ -61,6 +63,7 @@ public Box someFuncThatIRemade(BlockState state) {
         }
     }
 
+    @Unique
     public boolean calculateWhichTypeOfStairThisIsButDoesntWorkBecauseWeDontHaveAdjBlocks(BlockState state) {
         EmptyBlockView blockView = new EmptyBlockView() {
             @Override
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
deleted file mode 100644
index 1572a082..00000000
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
-
-import net.minecraft.util.math.MathHelper;
-
-public class ServerSideRedstoneWireBlock {
-    public static int getWireColor(int powerLevel) {
-        float f = (float) powerLevel / 15.0F;
-        float g = f * 0.6F + 0.4F;
-        if (powerLevel == 0) {
-            g = 0.3F;
-        }
-
-        float h = f * f * 0.7F - 0.5F;
-        float j = f * f * 0.6F - 0.7F;
-        if (h < 0.0F) {
-            h = 0.0F;
-        }
-
-        if (j < 0.0F) {
-            j = 0.0F;
-        }
-
-        int k = MathHelper.clamp((int) (g * 255.0F), 0, 255);
-        int l = MathHelper.clamp((int) (h * 255.0F), 0, 255);
-        int m = MathHelper.clamp((int) (j * 255.0F), 0, 255);
-        return -16777216 | k << 16 | l << 8 | m;
-    }
-}
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
similarity index 75%
rename from 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
rename to 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
index 257db1a9..f42641fb 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BiomeColors.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.util.math.BlockPos;
@@ -7,8 +7,8 @@
 import java.util.Iterator;
 
 public class BiomeColors {
-    private static final ColorProvider GRASS_COLOR = (biome, pos) -> biome.getGrassColor(pos);
-    private static final ColorProvider FOLIAGE_COLOR = (biome, pos) -> biome.getFoliageColor(pos);
+    private static final ColorProvider GRASS_COLOR = Biome::getGrassColor;
+    private static final ColorProvider FOLIAGE_COLOR = Biome::getFoliageColor;
     private static final ColorProvider WATER_COLOR = (biome, pos) -> biome.getWaterColor();
 
     private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider provider) {
@@ -17,7 +17,7 @@ private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider pro
         int k = 0;
 
         int l;
-        for (Iterator iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
+        for (Iterator<BlockPos.Mutable> iterator = BlockPos.mutableIterate(pos.add(-1, 0, -1), pos.add(1, 0, 1)).iterator(); iterator.hasNext(); k += l & 255) {
             BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next();
             l = provider.getColorAtPos(view.getBiome(mutable), mutable);
             i += (l & 16711680) >> 16;
diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
similarity index 84%
rename from 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
rename to 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
index 3e3e044c..b6819227 100644
--- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColorable.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.BlockState;
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
similarity index 84%
rename from 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
rename to 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
index 4df7551c..2bd090ca 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/BlockColors.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import net.minecraft.block.*;
@@ -19,7 +19,7 @@ public BlockColors() {
     public static BlockColors create() {
         final BlockColors blockColors = new BlockColors();
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            DoublePlantBlock.DoublePlantType doublePlantType = (DoublePlantBlock.DoublePlantType) blockState.get(DoublePlantBlock.VARIANT);
+            DoublePlantBlock.DoublePlantType doublePlantType = blockState.get(DoublePlantBlock.VARIANT);
             return blockView == null || blockPos == null || doublePlantType != DoublePlantBlock.DoublePlantType.GRASS && doublePlantType != DoublePlantBlock.DoublePlantType.FERN ? -1 : BiomeColors.getGrassColor(blockView, blockPos);
         }, Blocks.DOUBLE_PLANT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
@@ -38,7 +38,7 @@ public static BlockColors create() {
         }, Blocks.FLOWER_POT);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : GrassColors.getColor(0.5D, 1.0D), Blocks.GRASS);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            PlanksBlock.WoodType woodType = (PlanksBlock.WoodType) blockState.get(Leaves1Block.VARIANT);
+            PlanksBlock.WoodType woodType = blockState.get(Leaves1Block.VARIANT);
             if (woodType == PlanksBlock.WoodType.SPRUCE) {
                 return FoliageColors.getSpruceColor();
             } else if (woodType == PlanksBlock.WoodType.BIRCH) {
@@ -49,10 +49,10 @@ public static BlockColors create() {
         }, Blocks.LEAVES);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.LEAVES2);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getWaterColor(blockView, blockPos) : -1, Blocks.WATER, Blocks.FLOWING_WATER);
-        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877((Integer) blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
+        blockColors.method_12158((blockState, blockView, blockPos, i) -> RedstoneWireBlock.method_8877(blockState.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : -1, Blocks.SUGARCANE);
         blockColors.method_12158((blockState, blockView, blockPos, i) -> {
-            int j = (Integer) blockState.get(AttachedStemBlock.AGE);
+            int j = blockState.get(AttachedStemBlock.AGE);
             int k = j * 32;
             int l = 255 - j * 8;
             int m = j * 4;
@@ -71,9 +71,9 @@ public static BlockColors create() {
     }
 
     public int method_13410(BlockState blockState) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         if (blockColorable != null) {
-            return blockColorable.method_12155(blockState, (EmptyBlockView) null, (BlockPos) null, 0);
+            return blockColorable.method_12155(blockState, null, null, 0);
         } else {
             MaterialColor materialColor = blockState.getMaterialColor();
             return materialColor != null ? materialColor.color : -1;
@@ -81,15 +81,14 @@ public int method_13410(BlockState blockState) {
     }
 
     public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) {
-        BlockColorable blockColorable = (BlockColorable) this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
+        BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock()));
         return blockColorable == null ? -1 : blockColorable.method_12155(blockState, blockView, blockPos, i);
     }
 
     public void method_12158(BlockColorable blockColorable, Block... blocks) {
         int i = blocks.length;
 
-        for (int j = 0; j < i; ++j) {
-            Block block = blocks[j];
+        for (Block block : blocks) {
             this.BlockColor2Id.set(blockColorable, Block.getIdByBlock(block));
         }
 
diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
similarity index 78%
rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
rename to 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
index 8c32f48f..b63e543b 100644
--- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/FoliageColors.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
@@ -30,8 +30,8 @@ public static int getDefaultColor() {
     }
 
     public static int getFoliageColor(Biome biome) {
-        double d = (double) MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return FoliageColors.getColor(d, e);
     }
 }
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
similarity index 74%
rename from 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
rename to 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
index 88687071..afee2b70 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/GrassColors.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java
@@ -1,4 +1,4 @@
-package dev.u9g.minecraftdatagenerator.ClientSideAnnoyances;
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
 
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.biome.Biome;
@@ -19,8 +19,8 @@ public static int getColor(double temperature, double humidity) {
     }
 
     public static int getGrassColor(Biome biome) {
-        double d = (double) MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
-        double e = (double) MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
+        double d = MathHelper.clamp(biome.getTemperature(), 0.0F, 1.0F);
+        double e = MathHelper.clamp(biome.getRainfall(), 0.0F, 1.0F);
         return GrassColors.getColor(d, e);
     }
 }
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
new file mode 100644
index 00000000..75c9f89c
--- /dev/null
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java
@@ -0,0 +1,28 @@
+package dev.u9g.minecraftdatagenerator.clientsideannoyances;
+
+import net.minecraft.util.math.MathHelper;
+
+public class ServerSideRedstoneWireBlock {
+    public static int getWireColor(int powerLevel) {
+        float f = (float) powerLevel / 15.0F;
+        float g = f * 0.6F + 0.4F;
+        if (powerLevel == 0) {
+            g = 0.3F;
+        }
+
+        float h = f * f * 0.7F - 0.5F;
+        float j = f * f * 0.6F - 0.7F;
+        if (h < 0.0F) {
+            h = 0.0F;
+        }
+
+        if (j < 0.0F) {
+            j = 0.0F;
+        }
+
+        int k = MathHelper.clamp((int) (g * 255.0F), 0, 255);
+        int l = MathHelper.clamp((int) (h * 255.0F), 0, 255);
+        int m = MathHelper.clamp((int) (j * 255.0F), 0, 255);
+        return -16777216 | k << 16 | l << 8 | m;
+    }
+}
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
index b2789fd0..2bb5a0be 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java
@@ -96,31 +96,22 @@ public JsonObject toJSON() {
             return shapes;
         }
 
-        private static class Shapes {
-            final List<Box> boxes;
-
-            public Shapes(List<Box> boxes) {
-                this.boxes = boxes;
-            }
+        private record Shapes(List<Box> boxes) {
 
             public JsonArray toJSON() {
-                JsonArray arr = new JsonArray();
-                boxes.forEach(box -> arr.add(jsonOf(box)));
-                return arr;
-            }
+                        JsonArray arr = new JsonArray();
+                        boxes.forEach(box -> arr.add(jsonOf(box)));
+                        return arr;
+                    }
 
-            @Override
-            public boolean equals(Object o) {
-                if (this == o) return true;
-                if (o == null || getClass() != o.getClass()) return false;
-                Shapes shapes = (Shapes) o;
-                return Objects.equals(boxes, shapes.boxes);
-            }
+                    @Override
+                    public boolean equals(Object o) {
+                        if (this == o) return true;
+                        if (o == null || getClass() != o.getClass()) return false;
+                        Shapes shapes = (Shapes) o;
+                        return Objects.equals(boxes, shapes.boxes);
+                    }
 
-            @Override
-            public int hashCode() {
-                return boxes != null ? boxes.hashCode() : 0;
-            }
         }
     }
 }
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
index 6a33b00d..d5ef72ef 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
@@ -55,7 +55,7 @@ private static Entity makeEntity(Class<? extends Entity> type) {
     private static String getCategoryFrom(@NotNull Class<?> entityClass) {
         if (entityClass == PlayerEntity.class) return "other"; // fail early for player entities
         String packageName = entityClass.getPackage().getName();
-        String category = switch (packageName) {
+        return switch (packageName) {
             case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
             case "net.minecraft.entity.boss", "net.minecraft.entity.mob", "net.minecraft.entity.boss.dragon" ->
                     "Hostile mobs";
@@ -65,7 +65,6 @@ private static String getCategoryFrom(@NotNull Class<?> entityClass) {
             case "net.minecraft.entity" -> "other";
             default -> throw new Error("Unexpected entity type: " + packageName);
         };
-        return category;
     }
 
     //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information
diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
index a4f970c9..8d1b2a84 100644
--- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
+++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java
@@ -3,10 +3,10 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.BlockColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.FoliageColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.GrassColors;
-import dev.u9g.minecraftdatagenerator.ClientSideAnnoyances.ServerSideRedstoneWireBlock;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.BlockColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.FoliageColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.GrassColors;
+import dev.u9g.minecraftdatagenerator.clientsideannoyances.ServerSideRedstoneWireBlock;
 import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor;
 import dev.u9g.minecraftdatagenerator.util.EmptyBlockView;
 import dev.u9g.minecraftdatagenerator.util.Registries;
diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
index a71961c9..e27fb68f 100644
--- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
+++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java
@@ -75,7 +75,7 @@ public static JsonObject generateEnchantment(Registry<Enchantment> registry, Enc
         List<Enchantment> incompatibleEnchantments = registry.stream()
                 .filter(other -> !enchantment.canCombine(other))
                 .filter(other -> other != enchantment)
-                .collect(Collectors.toList());
+                .toList();
 
         JsonArray excludes = new JsonArray();
         for (Enchantment excludedEnchantment : incompatibleEnchantments) {