From 0f1c6bdd04a058e91eda4feb112c9865501cb329 Mon Sep 17 00:00:00 2001 From: Alex <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Sun, 31 Dec 2023 23:07:36 +0100 Subject: [PATCH] New changes (#12) * Shutdown fast * Change to order of releases * Revert "Shutdown fast" This reverts commit be2ea227718b19b00a0be0e59ec54bb87ffd5ea2. * Remove all shutdown hook, we do not care about generator worlds * Update README.md * Fix typo * Add OS-specific commands * More code improvements * Fix compilation * Add job timeout * Revert "Remove all shutdown hook, we do not care about generator worlds" This reverts commit 44117795360c9d67fab15566e2fc6436bfe9ac6f. * More aggressive server stopping --- .github/workflows/build.yml | 9 +++-- .../BiomeColors.java | 8 ++-- .../clientsideannoyances}/BlockColorable.java | 2 +- .../BlockColors.java | 19 +++++----- .../clientsideannoyances}/FoliageColors.java | 6 +-- .../GrassColors.java | 6 +-- .../ServerSideRedstoneWireBlock.java | 2 +- .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 8 ++-- .../mixin/ReadyMixin.java | 6 +-- .../BiomeColors.java | 12 +++--- .../clientsideannoyances}/BlockColorable.java | 2 +- .../BlockColors.java | 19 +++++----- .../FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../SkyColor.java | 2 +- .../generators/BiomesDataGenerator.java | 2 +- .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 6 +-- .../mixin/ReadyMixin.java | 6 +-- .../BiomeColors.java | 8 ++-- .../BlockColorable.java | 2 +- .../BlockColors.java | 7 ++-- .../clientsideannoyances}/FoliageColors.java | 2 +- .../clientsideannoyances}/GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 8 ++-- .../mixin/ReadyMixin.java | 7 ++-- .../BiomeColors.java | 2 +- .../BlockColorable.java | 2 +- .../BlockColors.java | 5 +-- .../clientsideannoyances}/FoliageColors.java | 2 +- .../clientsideannoyances}/GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../generators/BiomesDataGenerator.java | 3 +- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 8 ++-- .../mixin/ReadyMixin.java | 7 ++-- .../clientsideannoyances}/FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../generators/DataGenerators.java | 12 +++--- .../generators/TintsDataGenerator.java | 6 +-- .../mixin/ReadyMixin.java | 6 +-- .../clientsideannoyances}/FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../generators/DataGenerators.java | 12 +++--- .../generators/TintsDataGenerator.java | 6 +-- .../mixin/ReadyMixin.java | 6 +-- .../clientsideannoyances}/FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../generators/DataGenerators.java | 12 +++--- .../generators/EnchantmentsDataGenerator.java | 2 +- .../generators/TintsDataGenerator.java | 6 +-- .../mixin/ReadyMixin.java | 6 +-- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- .../mojangannoyances/BlockColors.java | 18 ++++----- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- .../mojangannoyances/BlockColors.java | 18 ++++----- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- .../mojangannoyances/BlockColors.java | 18 ++++----- .../BiomeBlockColors.java | 2 +- .../FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 6 +-- .../mixin/ReadyMixin.java | 6 +-- .../BiomeBlockColors.java | 4 +- .../BiomeColors.java | 8 ++-- .../FoliageColors.java | 2 +- .../GrassColors.java | 2 +- .../ServerSideRedstoneWireBlock.java | 2 +- .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 8 ++-- .../mixin/ReadyMixin.java | 6 +-- .../mixin/overwrite/CocoaBlockOverwrite.java | 2 + .../SkeletonSkullBlockOverwrite.java | 3 ++ .../mixin/overwrite/StairBlockOverwrite.java | 3 ++ .../ServerSideRedstoneWireBlock.java | 28 -------------- .../BiomeColors.java | 8 ++-- .../clientsideannoyances}/BlockColorable.java | 2 +- .../BlockColors.java | 19 +++++----- .../clientsideannoyances}/FoliageColors.java | 6 +-- .../GrassColors.java | 6 +-- .../ServerSideRedstoneWireBlock.java | 28 ++++++++++++++ .../BlockCollisionShapesDataGenerator.java | 33 ++++++---------- .../generators/DataGenerators.java | 12 +++--- .../generators/EntitiesDataGenerator.java | 3 +- .../generators/TintsDataGenerator.java | 8 ++-- .../mixin/ReadyMixin.java | 6 +-- .../generators/EnchantmentsDataGenerator.java | 2 +- .../mixin/ReadyMixin.java | 2 +- README.md | 38 +++++++++++++++++-- settings.gradle | 2 +- 117 files changed, 420 insertions(+), 456 deletions(-) rename 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (75%) rename {1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/BlockColorable.java (84%) rename 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColors.java (84%) rename {1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (78%) rename 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (74%) rename {1.7/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (74%) rename {1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/BlockColorable.java (84%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColors.java (85%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/FoliageColors.java (91%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (88%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/SkyColor.java (97%) rename 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (79%) rename 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColorable.java (83%) rename 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColors.java (95%) rename {1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (93%) rename {1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/GrassColors.java (92%) rename 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename 1.13/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (97%) rename 1.13/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColorable.java (83%) rename 1.13/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColors.java (96%) rename {1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (93%) rename {1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/GrassColors.java (92%) rename {1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename {1.16/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (93%) rename 1.14/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (92%) rename {1.13/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename {1.14/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (93%) rename 1.15/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (92%) rename 1.15/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/ServerSideRedstoneWireBlock.java (94%) rename {1.15/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (93%) rename 1.16/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (92%) rename 1.16/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/ServerSideRedstoneWireBlock.java (94%) rename 1.7/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeBlockColors.java (98%) rename 1.7/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/FoliageColors.java (93%) rename 1.7/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (92%) rename {1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) rename 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeBlockColors.java (96%) rename 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (75%) rename 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/FoliageColors.java (94%) rename 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (92%) rename 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/ServerSideRedstoneWireBlock.java (92%) delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances/ServerSideRedstoneWireBlock.java rename 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BiomeColors.java (75%) rename {1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/BlockColorable.java (84%) rename 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/BlockColors.java (84%) rename {1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/ClientSideAnnoyances => 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances}/FoliageColors.java (78%) rename 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/{ClientSideAnnoyances => clientsideannoyances}/GrassColors.java (74%) create mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad1ea4b..7bd6150 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,18 +4,19 @@ on: branches: - main pull_request: - branches: + branches: - main jobs: build: - runs-on: ubuntu-latest - strategy: matrix: - version: ["1.7", "1.8.9", "1.9.4", "1.10.2", "1.11.2", "1.12.2", "1.13", "1.14", "1.15", "1.16", "1.17", "1.18", "1.19", "1.19.2", "22w19a", "1.20"] + version: ["1.7", "1.8.9", "1.9.4", "1.10.2", "1.11.2", "1.12.2", "1.13", "1.14", "1.15", "1.16", "1.17", "1.18", "22w19a", "1.19", "1.19.2", "1.20"] name: Build ${{ matrix.version }} + timeout-minutes: 10 + + runs-on: ubuntu-latest steps: - name: Checkout repository 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 257db1a..f42641f 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 net.minecraft.world.biome.Biome; 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 @@ public class BiomeColors { 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 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 3e3e044..b681922 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 4df7551..2bd090c 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 class 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 class BlockColors { }, 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 class BlockColors { }, 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 class BlockColors { } 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 class BlockColors { } 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 8c32f48..b63e543 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 class FoliageColors { } 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 8868707..afee2b7 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 class GrassColors { } 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 1572a08..75c9f89 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 b2789fd..2bb5a0b 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 273d67c..249c630 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 5828f9e..3703b84 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 a4f970c..8d1b2a8 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 32871cc..f5608f0 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,12 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 9bee185..eb56ce4 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 @@ import java.util.Iterator; 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 @@ public class BiomeColors { 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 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 3e3e044..b681922 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 773f95f..5053ac7 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 class 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 class BlockColors { }, 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 class BlockColors { }, 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 class BlockColors { } 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 class BlockColors { } 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 d728f58..f4d20ec 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 2e828e1..0528f39 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 1572a08..75c9f89 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 033a11c..fd0b7ae 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 893c26c..1453aa2 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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 fe81458..47cac43 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 273d67c..249c630 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 cb4b58b..b1b24cf 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 ce9c0ee..401c2c5 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 32871cc..f5608f0 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,12 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 e4070ad..874569b 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 net.minecraft.world.biome.Biome; 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 @@ public class BiomeColors { int l; for (Iterator 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 d144385..6480990 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 a18847a..51bf78c 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 class BlockColors { }, 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 class BlockColors { 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 9a7ad29..1d3f948 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 d6fe5bd..9d65372 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 c6b2943..f733e90 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 1036d62..f687045 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 273d67c..249c630 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 0b375d5..5528e0b 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 146afba..72c7951 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 5e22dfe..f5608f0 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,13 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - DGU.getCurrentlyRunningServer().stopServer(); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 a610551..a661211 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 280d2ee..f6baf12 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 eec0c8e..a372bf6 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 class BlockColors { 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 9a7ad29..1d3f948 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 d6fe5bd..9d65372 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 c6b2943..f733e90 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 133b8ef..1de3cf3 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 @@ import java.util.Objects; 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/DataGenerators.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 3c05c30..e726601 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -44,16 +44,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -64,16 +64,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 0; } } 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 f56096d..d2db88d 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 @@ public class EntitiesDataGenerator implements IDataGenerator { if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities Class 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 a6bd063..07935d7 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 5e22dfe..f5608f0 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,13 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - DGU.getCurrentlyRunningServer().stopServer(); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 97c5735..f1068eb 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 ff1ce7b..9127091 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 c6b2943..f733e90 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/DataGenerators.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 3c05c30..e726601 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -44,16 +44,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -64,16 +64,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 0; } } 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 754d7db..8ae3fda 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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/mixin/ReadyMixin.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 2480449..53d5112 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -17,12 +17,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = MinecraftVersion.create().getName(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 97c5735..f1068eb 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 300131c..ee6a498 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 c9b2987..5a21ac1 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/DataGenerators.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 3c05c30..e726601 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -44,16 +44,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -64,16 +64,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 0; } } 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 a9b7788..0792641 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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/mixin/ReadyMixin.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 2480449..53d5112 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -17,12 +17,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = MinecraftVersion.create().getName(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 97c5735..f1068eb 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 8273ed5..9452d37 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 c9b2987..5a21ac1 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/DataGenerators.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 3c05c30..e726601 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -44,16 +44,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -64,16 +64,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 0; } } 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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 3d0a895..f480e93 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 9735644..3fe886a 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -17,12 +17,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = MinecraftVersion.field_25319.getName(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index f83555b..b0b039f 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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/mixin/ReadyMixin.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 6d9415e..ba3b26b 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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/mixin/ReadyMixin.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 6d9415e..ba3b26b 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } 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 2107780..e8430eb 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 class BlockColors { 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 class BlockColors { } 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 class BlockColors { } 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 class BlockColors { private void registerColorProperties(Set> 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 @@ public class BlockColors { } public Set> 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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/mixin/ReadyMixin.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 6d9415e..ba3b26b 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } 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 2107780..e8430eb 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 class BlockColors { 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 class BlockColors { } 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 class BlockColors { } 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 class BlockColors { private void registerColorProperties(Set> 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 @@ public class BlockColors { } public Set> 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 a015cc4..6bd50d7 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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/mixin/ReadyMixin.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 6d9415e..ba3b26b 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } 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 368da7f..a0a3bdf 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 class BlockColors { 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 class BlockColors { } 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 class BlockColors { } 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 class BlockColors { private void registerColorProperties(Set> 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 @@ public class BlockColors { } public Set> 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 7ea5ca9..c032c33 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 bb71f22..b5538a6 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 9841e73..0ca9862 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 1572a08..75c9f89 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 8cbef35..b2d77af 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index d8986bd..c2ac739 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 6db70ce..ebfcf93 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 fdb342f..414749b 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 1e9185f..7ea7dcb 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -19,12 +19,12 @@ public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { Registries.init(); - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = (new File(".")).toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 e860bb9..ee0d220 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 class BiomeBlockColors { } 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 3b02008..fca5440 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 net.minecraft.world.biome.Biome; 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 @@ public class BiomeColors { 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 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 c137d32..1a55df0 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 112d816..ff015f9 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 1572a08..75c9f89 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 6d02560..38ec86b 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 273d67c..249c630 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 7ade830..e0e9e74 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 c69b3cb..4412712 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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/ReadyMixin.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 32871cc..f5608f0 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,12 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 8290f2b..5158ecd 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,11 @@ import net.minecraft.util.math.Direction; 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 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 538eba5..c0e7633 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,11 @@ import net.minecraft.util.math.BlockPos; 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 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 +21,7 @@ public class SkeletonSkullBlockOverwrite { }; } + @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 bf64f53..2da7786 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 net.minecraft.world.World; 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 abstract class StairBlockOverwrite extends Block { 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 abstract class StairBlockOverwrite extends Block { } } + @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 1572a08..0000000 --- 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 257db1a..f42641f 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 net.minecraft.world.biome.Biome; 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 @@ public class BiomeColors { 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 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 3e3e044..b681922 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 4df7551..2bd090c 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 class 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 class BlockColors { }, 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 class BlockColors { }, 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 class BlockColors { } 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 class BlockColors { } 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 8c32f48..b63e543 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 class FoliageColors { } 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 8868707..afee2b7 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 class GrassColors { } 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 0000000..75c9f89 --- /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 b2789fd..2bb5a0b 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 class BlockCollisionShapesDataGenerator implements IDataGenerator { return shapes; } - private static class Shapes { - final List boxes; - - public Shapes(List boxes) { - this.boxes = boxes; - } + private record Shapes(List 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/DataGenerators.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java index 273d67c..249c630 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -45,16 +45,16 @@ public class DataGenerators { try { Files.createDirectories(outputDirectory); } catch (IOException exception) { - logger.log(Level.INFO, "Failed to create data generator output directory at " + outputDirectory); + logger.info("Failed to create data generator output directory at " + outputDirectory); exception.printStackTrace(); return false; } int generatorsFailed = 0; - logger.log(Level.INFO, MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); + logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); for (IDataGenerator dataGenerator : GENERATORS) { - logger.log(Level.INFO, MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); try { String outputFileName = String.format("%s.json", dataGenerator.getDataName()); JsonElement outputElement = dataGenerator.generateDataJson(); @@ -65,16 +65,16 @@ public class DataGenerators { jsonWriter.setIndent(" "); Streams.write(outputElement, jsonWriter); } - logger.log(Level.INFO, MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); + logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); } catch (Throwable exception) { - logger.log(Level.INFO, MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); + logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); exception.printStackTrace(); generatorsFailed++; } } - logger.log(Level.INFO, "Finishing running data generators"); + logger.info("Finishing running data generators"); return generatorsFailed == 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 6a33b00..d5ef72e 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 @@ public class EntitiesDataGenerator implements IDataGenerator { 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 a4f970c..8d1b2a8 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 @@ package dev.u9g.minecraftdatagenerator.generators; 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.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 32871cc..f5608f0 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -16,12 +16,12 @@ import java.util.logging.Level; public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.log(Level.INFO, "Starting data generation!"); + Main.LOGGER.info("Starting data generation!"); String versionName = DGU.getCurrentlyRunningServer().getVersion(); Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.log(Level.INFO, "Done data generation!"); - System.exit(0); + Main.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); } } 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 a71961c..e27fb68 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 class EnchantmentsDataGenerator implements IDataGenerator { List 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/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 6d9415e..ba3b26b 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -22,6 +22,6 @@ public class ReadyMixin { Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); DataGenerators.runDataGenerators(dataDumpDirectory); Main.LOGGER.info("Done data generation!"); - DGU.getCurrentlyRunningServer().stop(false); + Runtime.getRuntime().halt(0); } } diff --git a/README.md b/README.md index 18f7118..a13bc78 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,34 @@ -1. Update gradle.properties with the latest values from https://fabricmc.net/develop/ -2. Run `./gradlew build` and fix any errors caused by API changes if any (see https://fabricmc.net/blog/) -3. Run `./gradlew runServer` -4. Check the results in `run/minecraft-data` \ No newline at end of file +# minecraft-data-generator-server + +This tool generates minecraft-data files based on a running server using a fabric mod. +The supported versions can be read in the directory structure. +Every version has its own directory. + +## Usage + +You can put any version that has a directory into the command below. +Just replace `` with the version you want to generate. + +For Linux/Mac OS: +```bash +./gradlew ::runServer +``` + +For Windows: +```bash +gradlew.bat ::runServer +``` + +You can then find the minecraft-data in the `/run/minecraft-data` directory. + +## Adding a new version + +To add a new version, you need to create a new directory in the root directory with the version name. +Then you need to add the version to the list in the `settings.gradle.kts` file. +Then also add it to the `.github/workflows/build.yml` file. +Then copy the code of the most recently released version into the new directory. +Then you need to change the values in the `gradle.properties` file. +At last, you need to fix all code issues that are caused by the new version. +For that, use an IDE like IntelliJ IDEA to fix the issues. +Once everything compiles, you can commit the changes, push them to your fork and create a pull request. +Once your PR was accepted and merged, the new version will be available in the next release. diff --git a/settings.gradle b/settings.gradle index 8551948..9609f9b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -42,8 +42,8 @@ dependencyResolutionManagement { "1.16", "1.17", "1.18", + "22w19a", "1.19", "1.19.2", - "22w19a", "1.20", ].forEach { include it }