From 71070c32bc021c20d060249d84c5d3fb8033b0ac Mon Sep 17 00:00:00 2001 From: Alex <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Sun, 14 Jul 2024 09:23:34 +0200 Subject: [PATCH] Reduce duplicate code (#18) * Reduce duplicate code * Fix gradle task name * Revert name changes * Revert action name * Cleanup * Revert to java 17 * Fix generation * Cleanup * Simplify code of DGU * Remove unnecessary annotations * Remove unused var * Halt with error on error * Remove unused mixins * Update fabric loader * Ignore success result * Update gradle and use merged jar * Implement new client and server merged environment for running fabric * Set server run dir as asset dir * More cleanup * More cleanup 2 * More improvements * Remove more duplicate code * Use newer java methods * More cleanup * Remove SoundAccessors * More cleanup * Use java 21 for build * Initial work on 1.20.5 * Cleanup a lot of stuff * Do not generate mod jars to speed up builds * Override merger on now open classes directly * Use recommended approach * Readd custom merger * Working materials data generator * Fix inconsistencies * Fix collision order to be random * Use LinkedHashMap for more reproducibility * Fix imports --- .github/workflows/build.yml | 27 +- 1.10.2/build.gradle | 68 ++--- 1.10.2/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../clientsideannoyances/BiomeColors.java | 47 ---- .../clientsideannoyances/BlockColorable.java | 10 - .../clientsideannoyances/BlockColors.java | 96 ------- .../clientsideannoyances/FoliageColors.java | 37 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 28 -- .../BlockCollisionShapesDataGenerator.java | 24 +- .../generators/BlocksDataGenerator.java | 5 - .../generators/DataGenerators.java | 81 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/InstrumentsDataGenerator.java | 7 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 13 +- .../generators/TintsDataGenerator.java | 45 ++-- .../mixin/NoteBlockAccessor.java | 4 +- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 12 - .../u9g/minecraftdatagenerator/util/DGU.java | 66 +---- 1.10.2/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 1.11.2/build.gradle | 68 ++--- 1.11.2/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../clientsideannoyances/BiomeColors.java | 55 ---- .../clientsideannoyances/BlockColorable.java | 10 - .../clientsideannoyances/BlockColors.java | 95 ------- .../clientsideannoyances/FoliageColors.java | 28 -- .../clientsideannoyances/GrassColors.java | 19 -- .../ServerSideRedstoneWireBlock.java | 28 -- .../clientsideannoyances/SkyColor.java | 74 ------ .../generators/BiomesDataGenerator.java | 4 +- .../BlockCollisionShapesDataGenerator.java | 31 ++- .../generators/BlocksDataGenerator.java | 5 - .../generators/DataGenerators.java | 81 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 8 +- .../generators/EntitiesDataGenerator.java | 11 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/InstrumentsDataGenerator.java | 7 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 13 +- .../generators/TintsDataGenerator.java | 44 ++-- .../mixin/NoteBlockAccessor.java | 4 +- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 12 - .../u9g/minecraftdatagenerator/util/DGU.java | 66 +---- 1.11.2/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 1.12.2/build.gradle | 68 ++--- 1.12.2/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../clientsideannoyances/BiomeColors.java | 46 ---- .../clientsideannoyances/BlockColorable.java | 10 - .../clientsideannoyances/BlockColors.java | 98 ------- .../clientsideannoyances/FoliageColors.java | 36 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 25 -- .../BlockCollisionShapesDataGenerator.java | 24 +- .../generators/BlocksDataGenerator.java | 5 - .../generators/DataGenerators.java | 81 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/InstrumentsDataGenerator.java | 7 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 14 +- .../generators/TintsDataGenerator.java | 37 ++- .../mixin/NoteBlockAccessor.java | 4 +- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 12 - .../u9g/minecraftdatagenerator/util/DGU.java | 66 +---- 1.12.2/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 1.13/build.gradle | 68 ++--- 1.13/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../clientsideannoyances/BiomeColors.java | 49 ---- .../clientsideannoyances/BlockColorable.java | 10 - .../clientsideannoyances/BlockColors.java | 65 ----- .../clientsideannoyances/FoliageColors.java | 36 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 25 -- .../BlockCollisionShapesDataGenerator.java | 6 +- .../generators/BlocksDataGenerator.java | 17 +- .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/ParticlesDataGenerator.java | 14 +- .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 13 +- .../generators/TintsDataGenerator.java | 43 ++-- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 12 - .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- 1.13/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 1.14/build.gradle | 44 +++- 1.14/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../clientsideannoyances/FoliageColors.java | 36 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 25 -- .../generators/BiomesDataGenerator.java | 1 - .../BlockCollisionShapesDataGenerator.java | 6 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 13 - .../generators/EntitiesDataGenerator.java | 21 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 41 +-- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 13 - .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- .../util/EmptyRenderBlockView.java | 57 ----- 1.14/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 1 - 1.15/build.gradle | 44 +++- 1.15/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../clientsideannoyances/FoliageColors.java | 36 --- .../clientsideannoyances/GrassColors.java | 27 -- .../ServerSideRedstoneWireBlock.java | 34 --- .../BlockCollisionShapesDataGenerator.java | 6 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 13 - .../generators/EntitiesDataGenerator.java | 25 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 44 ++-- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 13 - .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- 1.15/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 1 - 1.16/build.gradle | 44 +++- 1.16/gradle.properties | 9 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../clientsideannoyances/FoliageColors.java | 36 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 34 --- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 22 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 44 ++-- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 13 - .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- 1.16/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 1 - 1.17/build.gradle | 44 +++- 1.17/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 79 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 29 +-- .../ClientPlayerInteractionManagerMixin.java | 57 ----- .../mixin/ReadyMixin.java | 16 +- .../mixin/SoundAccessor.java | 13 - .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- 1.17/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 4 +- 1.18/build.gradle | 44 +++- 1.18/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 75 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 26 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 29 +-- .../ClientPlayerInteractionManagerMixin.java | 57 ----- .../mixin/ReadyMixin.java | 16 +- .../mixin/SoundAccessor.java | 13 - .../u9g/minecraftdatagenerator/util/DGU.java | 129 +--------- 1.18/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 4 +- 1.19.2/build.gradle | 44 +++- 1.19.2/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../generators/BiomesDataGenerator.java | 227 +---------------- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 78 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 9 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/SoundsDataGenerator.java | 9 +- .../generators/TintsDataGenerator.java | 33 +-- .../mixin/EntityTypeAccessor.java | 12 - .../mixin/ReadyMixin.java | 16 +- .../mixin/TheEndBiomeDataAccessor.java | 29 --- .../mojangannoyances/BiomeColors.java | 35 --- .../mojangannoyances/BlockColorProvider.java | 11 - .../mojangannoyances/BlockColors.java | 93 ------- .../u9g/minecraftdatagenerator/util/DGU.java | 15 +- 1.19.2/src/main/resources/fabric.mod.json | 9 +- .../minecraft-data-generator.mixins.json | 4 +- 1.19/build.gradle | 44 +++- 1.19/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../generators/BiomesDataGenerator.java | 240 ++---------------- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 18 +- .../generators/DataGenerators.java | 78 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 9 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/SoundsDataGenerator.java | 9 +- .../generators/TintsDataGenerator.java | 33 +-- .../mixin/EntityTypeAccessor.java | 12 - .../mixin/ReadyMixin.java | 16 +- .../mixin/TheEndBiomeDataAccessor.java | 29 --- .../mojangannoyances/BiomeColors.java | 35 --- .../mojangannoyances/BlockColorProvider.java | 11 - .../mojangannoyances/BlockColors.java | 93 ------- .../u9g/minecraftdatagenerator/util/DGU.java | 15 +- 1.19/src/main/resources/fabric.mod.json | 9 +- .../minecraft-data-generator.mixins.json | 4 +- 1.20.4/build.gradle | 44 +++- 1.20.4/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../generators/BiomesDataGenerator.java | 220 +--------------- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 21 +- .../generators/DataGenerators.java | 77 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 21 +- .../generators/EntitiesDataGenerator.java | 15 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/TintsDataGenerator.java | 33 +-- .../mixin/EntityTypeAccessor.java | 12 - .../mixin/ReadyMixin.java | 16 +- .../mixin/TheEndBiomeDataAccessor.java | 29 --- .../mojangannoyances/BiomeColors.java | 35 --- .../mojangannoyances/BlockColorProvider.java | 11 - .../mojangannoyances/BlockColors.java | 94 ------- .../u9g/minecraftdatagenerator/util/DGU.java | 15 +- 1.20.4/src/main/resources/fabric.mod.json | 9 +- .../minecraft-data-generator.mixins.json | 4 +- 1.20.5/build.gradle | 47 ++++ .../generators/BiomesDataGenerator.java | 115 +++++++++ .../BlockCollisionShapesDataGenerator.java | 110 ++++++++ .../generators/BlocksDataGenerator.java | 197 ++++++++++++++ .../generators/EffectsDataGenerator.java | 46 ++++ .../generators/EnchantmentsDataGenerator.java | 89 +++++++ .../generators/EntitiesDataGenerator.java | 119 +++++++++ .../generators/FoodsDataGenerator.java | 52 ++++ .../generators/InstrumentsDataGenerator.java | 25 ++ .../generators/ItemsDataGenerator.java | 88 +++++++ .../generators/LanguageDataGenerator.java | 27 ++ .../generators/MaterialsDataGenerator.java | 211 +++++++++++++++ .../generators/ParticlesDataGenerator.java | 33 +++ .../generators/RecipeDataGenerator.java | 128 ++++++++++ .../generators/TintsDataGenerator.java | 158 ++++++++++++ .../mixin/EULAMixin.java | 15 ++ .../mixin/ReadyMixin.java | 22 ++ .../u9g/minecraftdatagenerator/util/DGU.java | 21 ++ .../util/EmptyRenderBlockView.java | 72 ++++++ 1.20.5/src/main/resources/fabric.mod.json | 20 ++ .../minecraft-data-generator.mixins.json | 15 ++ 1.20/build.gradle | 44 +++- 1.20/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../generators/BiomesDataGenerator.java | 220 +--------------- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 21 +- .../generators/DataGenerators.java | 78 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 22 +- .../generators/EntitiesDataGenerator.java | 9 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 20 +- .../generators/SoundsDataGenerator.java | 12 +- .../generators/TintsDataGenerator.java | 33 +-- .../mixin/EntityTypeAccessor.java | 12 - .../mixin/ReadyMixin.java | 16 +- .../mixin/TheEndBiomeDataAccessor.java | 29 --- .../mojangannoyances/BiomeColors.java | 35 --- .../mojangannoyances/BlockColorProvider.java | 11 - .../mojangannoyances/BlockColors.java | 94 ------- .../u9g/minecraftdatagenerator/util/DGU.java | 15 +- 1.20/src/main/resources/fabric.mod.json | 9 +- .../minecraft-data-generator.mixins.json | 4 +- 1.7/build.gradle | 73 ++---- 1.7/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../BiomeBlockColors.java | 80 ------ .../clientsideannoyances/FoliageColors.java | 38 --- .../clientsideannoyances/GrassColors.java | 27 -- .../ServerSideRedstoneWireBlock.java | 28 -- .../BlockCollisionShapesDataGenerator.java | 24 +- .../generators/BlocksDataGenerator.java | 9 +- .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 3 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/InstrumentsDataGenerator.java | 2 +- .../generators/RecipeDataGenerator.java | 6 + .../generators/TintsDataGenerator.java | 43 ++-- .../mixin/BlocksMixin.java | 15 -- .../mixin/ReadyMixin.java | 19 +- .../mixin/overwrite/ItemEntityOverwrite.java | 4 +- .../u9g/minecraftdatagenerator/util/DGU.java | 24 +- .../util/EmptyBlockView.java | 61 ----- .../util/Registries.java | 34 +-- 1.7/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 1.8.9/build.gradle | 68 ++--- 1.8.9/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../BiomeBlockColors.java | 81 ------ .../clientsideannoyances/BiomeColors.java | 46 ---- .../clientsideannoyances/FoliageColors.java | 38 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 28 -- .../generators/BiomesDataGenerator.java | 88 +------ .../BlockCollisionShapesDataGenerator.java | 24 +- .../generators/BlocksDataGenerator.java | 5 - .../generators/DataGenerators.java | 80 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/TintsDataGenerator.java | 62 +++-- .../mixin/ReadyMixin.java | 17 +- .../mixin/overwrite/CocoaBlockOverwrite.java | 43 ---- .../EndPortalFrameBlockOverwrite.java | 34 --- .../mixin/overwrite/ItemEntityOverwrite.java | 24 -- .../SkeletonSkullBlockOverwrite.java | 28 -- .../mixin/overwrite/StairBlockOverwrite.java | 153 ----------- .../u9g/minecraftdatagenerator/util/DGU.java | 25 +- 1.8.9/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 9 +- 1.9.4/build.gradle | 68 ++--- 1.9.4/gradle.properties | 7 - .../dev/u9g/minecraftdatagenerator/Main.java | 13 - .../clientsideannoyances/BiomeColors.java | 47 ---- .../clientsideannoyances/BlockColorable.java | 10 - .../clientsideannoyances/BlockColors.java | 96 ------- .../clientsideannoyances/FoliageColors.java | 37 --- .../clientsideannoyances/GrassColors.java | 29 --- .../ServerSideRedstoneWireBlock.java | 28 -- .../BlockCollisionShapesDataGenerator.java | 24 +- .../generators/BlocksDataGenerator.java | 5 - .../generators/DataGenerators.java | 81 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EntitiesDataGenerator.java | 1 - .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/InstrumentsDataGenerator.java | 7 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/RecipeDataGenerator.java | 5 + .../generators/SoundsDataGenerator.java | 13 +- .../generators/TintsDataGenerator.java | 45 ++-- .../mixin/NoteBlockAccessor.java | 4 +- .../mixin/ReadyMixin.java | 17 +- .../mixin/SoundAccessor.java | 12 - .../u9g/minecraftdatagenerator/util/DGU.java | 59 +---- 1.9.4/src/main/resources/fabric.mod.json | 10 +- .../minecraft-data-generator.mixins.json | 3 - 22w19a/build.gradle | 44 +++- 22w19a/gradle.properties | 8 - .../dev/u9g/minecraftdatagenerator/Main.java | 14 - .../generators/BiomesDataGenerator.java | 28 +- .../BlockCollisionShapesDataGenerator.java | 11 +- .../generators/BlocksDataGenerator.java | 19 +- .../generators/DataGenerators.java | 78 ------ .../generators/EffectsDataGenerator.java | 1 - .../generators/EnchantmentsDataGenerator.java | 14 - .../generators/EntitiesDataGenerator.java | 22 +- .../generators/FoodsDataGenerator.java | 1 - .../generators/IDataGenerator.java | 10 - .../generators/MaterialsDataGenerator.java | 21 +- .../generators/ParticlesDataGenerator.java | 1 - .../generators/SoundsDataGenerator.java | 9 +- .../generators/TintsDataGenerator.java | 29 +-- .../ClientPlayerInteractionManagerMixin.java | 57 ----- .../mixin/ReadyMixin.java | 16 +- .../mixin/TheEndBiomeDataAccessor.java | 28 -- .../u9g/minecraftdatagenerator/util/DGU.java | 43 +--- 22w19a/src/main/resources/fabric.mod.json | 11 +- .../minecraft-data-generator.mixins.json | 4 +- README.md | 2 + build.gradle | 16 ++ buildSrc/build.gradle.kts | 56 ++++ .../CustomLegacyFabricMinecraftTransformer.kt | 23 ++ ...ustomOfficialFabricMinecraftTransformer.kt | 23 ++ common/build.gradle | 21 ++ .../MinecraftDataGenerator.java | 24 ++ .../generators/DataGenerators.java | 82 ++++++ .../generators/IDataGenerator.java | 5 +- gradle.properties | 3 - gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 29 ++- settings.gradle | 36 +-- 459 files changed, 3421 insertions(+), 9078 deletions(-) delete mode 100644 1.10.2/gradle.properties delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.11.2/gradle.properties delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.12.2/gradle.properties delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.13/gradle.properties delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.14/gradle.properties delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java delete mode 100644 1.15/gradle.properties delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.16/gradle.properties delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.17/gradle.properties delete mode 100644 1.17/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java delete mode 100644 1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.18/gradle.properties delete mode 100644 1.18/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java delete mode 100644 1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 1.19.2/gradle.properties delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java delete mode 100644 1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java delete mode 100644 1.19/gradle.properties delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java delete mode 100644 1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java delete mode 100644 1.20.4/gradle.properties delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java delete mode 100644 1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java create mode 100644 1.20.5/build.gradle create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/LanguageDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EULAMixin.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java create mode 100644 1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java create mode 100644 1.20.5/src/main/resources/fabric.mod.json create mode 100644 1.20.5/src/main/resources/minecraft-data-generator.mixins.json delete mode 100644 1.20/gradle.properties delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java delete mode 100644 1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java delete mode 100644 1.7/gradle.properties delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/BlocksMixin.java delete mode 100644 1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyBlockView.java delete mode 100644 1.8.9/gradle.properties delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/EndPortalFrameBlockOverwrite.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java delete mode 100644 1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java delete mode 100644 1.9.4/gradle.properties delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java delete mode 100644 22w19a/gradle.properties delete mode 100644 22w19a/src/main/java/dev/u9g/minecraftdatagenerator/Main.java delete mode 100644 22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java delete mode 100644 22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java delete mode 100644 22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java delete mode 100644 22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/CustomLegacyFabricMinecraftTransformer.kt create mode 100644 buildSrc/src/main/kotlin/CustomOfficialFabricMinecraftTransformer.kt create mode 100644 common/build.gradle create mode 100644 common/src/main/java/dev/u9g/minecraftdatagenerator/MinecraftDataGenerator.java create mode 100644 common/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java rename {1.10.2 => common}/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java (75%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1bb07f..a6ec2a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,26 @@ jobs: build: 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", "22w19a", "1.19", "1.19.2", "1.20", "1.20.4"] + 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", + "1.20.4", + "1.20.5" + ] name: Build ${{ matrix.version }} timeout-minutes: 10 @@ -25,10 +44,10 @@ jobs: - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Generate ${{ matrix.version }} @@ -40,5 +59,5 @@ jobs: uses: actions/upload-artifact@v4 with: name: data-${{ matrix.version }} - path: ${{ matrix.version }}/run/minecraft-data + path: ${{ matrix.version }}/run/server/minecraft-data if-no-files-found: error diff --git a/1.10.2/build.gradle b/1.10.2/build.gradle index 057916c..a25cddd 100644 --- a/1.10.2/build.gradle +++ b/1.10.2/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.10.2" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.10.2/gradle.properties b/1.10.2/gradle.properties deleted file mode 100644 index 335785f..0000000 --- a/1.10.2/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.10.2 -yarn_mappings=1.10.2+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index f42641f..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,47 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - 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) { - int i = 0; - int j = 0; - 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) { - BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next(); - l = provider.getColorAtPos(view.getBiome(mutable), mutable); - i += (l & 16711680) >> 16; - j += (l & '\uff00') >> 8; - } - - return (i / 9 & 255) << 16 | (j / 9 & 255) << 8 | k / 9 & 255; - } - - public static int getGrassColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, GRASS_COLOR); - } - - public static int getFoliageColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, WATER_COLOR); - } - - interface ColorProvider { - int getColorAtPos(Biome biome, BlockPos pos); - } -} - - diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java deleted file mode 100644 index b681922..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorable { - int method_12155(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i); -} 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 deleted file mode 100644 index 2bd090c..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java +++ /dev/null @@ -1,96 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.*; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.FlowerPotBlockEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public class BlockColors { - private final IdList BlockColor2Id = new IdList<>(32); - - public BlockColors() { - } - - public static BlockColors create() { - final BlockColors blockColors = new BlockColors(); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - 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) -> { - if (blockView != null && blockPos != null) { - BlockEntity blockEntity = blockView.getBlockEntity(blockPos); - if (blockEntity instanceof FlowerPotBlockEntity) { - Item item = ((FlowerPotBlockEntity) blockEntity).getItem(); - if (item instanceof BlockItem) { - BlockState blockState2 = Block.getBlockFromItem(item).getDefaultState(); - return blockColors.method_12157(blockState2, blockView, blockPos, i); - } - } - } - - return -1; - }, 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 = blockState.get(Leaves1Block.VARIANT); - if (woodType == PlanksBlock.WoodType.SPRUCE) { - return FoliageColors.getSpruceColor(); - } else if (woodType == PlanksBlock.WoodType.BIRCH) { - return FoliageColors.getBirchColor(); - } else { - return blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(); - } - }, 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(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); - int k = j * 32; - int l = 255 - j * 8; - int m = j * 4; - return k << 16 | l << 8 | m; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - if (blockView != null && blockPos != null) { - return BiomeColors.getGrassColor(blockView, blockPos); - } else { - return blockState.get(TallPlantBlock.TYPE) == TallPlantBlock.GrassType.DEAD_BUSH ? 16777215 : GrassColors.getColor(0.5D, 1.0D); - } - }, Blocks.TALLGRASS); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.VINE); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int method_13410(BlockState blockState) { - BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock())); - if (blockColorable != null) { - return blockColorable.method_12155(blockState, null, null, 0); - } else { - MaterialColor materialColor = blockState.getMaterialColor(); - return materialColor != null ? materialColor.color : -1; - } - } - - public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) { - 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 (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.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index b63e543..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 6396257; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - 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 deleted file mode 100644 index afee2b7..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - int k = j << 8 | i; - return k > colorMap.length ? -65281 : colorMap[k]; - } - - public static int getGrassColor(Biome biome) { - 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.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java deleted file mode 100644 index 75c9f89..0000000 --- a/1.10.2/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.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 2bb5a0b..02fd69a 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 @@ -79,7 +79,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } } if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { - return indexesOfBoxesInTheShapesCache.get(0); + return indexesOfBoxesInTheShapesCache.getFirst(); } else { JsonArray shapeIndexes = new JsonArray(); indexesOfBoxesInTheShapesCache.forEach(shapeIndex -> shapeIndexes.add(new JsonPrimitive(shapeIndex))); @@ -99,18 +99,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 284f566..1ec40ae 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -4,7 +4,6 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -28,12 +27,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { 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 deleted file mode 100644 index c89d077..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 6aba51e..ea880e4 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(Registries.STATUS_EFFECTS.getIdentifier(statusEffect)); 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 3703b84..18bbee5 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 @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = Registries.ENTITY_TYPES.getIdentifier(entityClass); diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index fd68583..f2ad50b 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = Registries.ITEMS.getIdentifier(foodItem); diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 3aa51c4..dcb6c5b 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -4,8 +4,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.mixin.NoteBlockAccessor; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import java.util.Objects; @@ -19,10 +18,10 @@ public class InstrumentsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { JsonArray array = new JsonArray(); int i = 0; - for (SoundEvent sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { + for (Sound sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { JsonObject object = new JsonObject(); object.addProperty("id", i++); - object.addProperty("name", ((SoundAccessor) sound).id().getPath().split("\\.")[2]); + object.addProperty("name", sound.getId().getPath().split("\\.")[2]); array.add(object); } return array; diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 2b1a508..36025a4 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import net.minecraft.client.particle.ParticleType; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(int id, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..553fbdf 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,11 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 9429a29..88e0e8a 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,17 +2,14 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; - +import net.minecraft.sound.Sound; public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(SoundEvent soundEvent) { + public static JsonObject generateSound(Sound soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", SoundEvent.REGISTRY.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor) soundEvent).id().getPath()); + soundDesc.addProperty("id", Sound.REGISTRY.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -25,7 +22,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - SoundEvent.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); + Sound.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 8d1b2a8..3923b2e 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,38 +3,30 @@ 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.mixin.BiomeAccessor; -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - - private static final BlockColors blockColors = BlockColors.create(); - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public Biome getBiome(BlockPos pos) { - return biome; - } - }; - int biomeGrassColor = GrassColors.getGrassColor(bv.getBiome(BlockPos.ORIGIN)); - int biomeFoliageColor = FoliageColors.getFoliageColor(bv.getBiome(BlockPos.ORIGIN)); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -45,30 +37,29 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getColorIntensity(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } private static int getBlockColor(Block block) { - return blockColors.method_13410(block.getDefaultState()); + return BlockColors.create().method_13410(block.getDefaultState()); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); @@ -158,8 +149,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java index 4bc3bcb..688aa1c 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java @@ -1,7 +1,7 @@ package dev.u9g.minecraftdatagenerator.mixin; import net.minecraft.block.NoteBlock; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -10,7 +10,7 @@ import java.util.List; @Mixin(NoteBlock.class) public interface NoteBlockAccessor { @Accessor("TUNES") - static List TUNES() { + static List TUNES() { return null; } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index fe50591..0000000 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.client.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index bf7137e..95094ee 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,82 +1,20 @@ package dev.u9g.minecraftdatagenerator.util; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.internal.bind.TypeAdapters; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; -import java.io.IOException; - public class DGU { - - public static Gson gson = new GsonBuilder().registerTypeAdapterFactory(TypeAdapters.newFactory(double.class, Double.class, new TypeAdapter() { - @Override - public Number read(JsonReader in) throws IOException { - if (in.peek() == JsonToken.NULL) { - in.nextNull(); - return null; - } - return in.nextDouble(); - } - - @Override - public void write(JsonWriter out, Number value) throws IOException { - out.value(value); - } - })).create(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.10.2/src/main/resources/fabric.mod.json b/1.10.2/src/main/resources/fabric.mod.json index a73252d..ffac96b 100644 --- a/1.10.2/src/main/resources/fabric.mod.json +++ b/1.10.2/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.10" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.10.2/src/main/resources/minecraft-data-generator.mixins.json b/1.10.2/src/main/resources/minecraft-data-generator.mixins.json index 4dd1315..3ed8234 100644 --- a/1.10.2/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.10.2/src/main/resources/minecraft-data-generator.mixins.json @@ -14,11 +14,8 @@ "MiningToolItemAccessor", "NoteBlockAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], - "client": [ - ], "injectors": { "defaultRequire": 1 }, diff --git a/1.11.2/build.gradle b/1.11.2/build.gradle index 057916c..87ed5b4 100644 --- a/1.11.2/build.gradle +++ b/1.11.2/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.11.2" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.11.2/gradle.properties b/1.11.2/gradle.properties deleted file mode 100644 index ff8f56c..0000000 --- a/1.11.2/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.11.2 -yarn_mappings=1.11.2+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index eb56ce4..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,55 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - private static final ColorProvider GRASS_COLOR = (biome, pos) -> { - 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 = 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(); - - private static int getColor(EmptyBlockView view, BlockPos pos, ColorProvider provider) { - int i = 0; - int j = 0; - 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) { - BlockPos.Mutable mutable = (BlockPos.Mutable) var6.next(); - l = provider.getColorAtPos(view.getBiome(mutable), mutable); - i += (l & 16711680) >> 16; - j += (l & '\uff00') >> 8; - } - - return (i / 9 & 255) << 16 | (j / 9 & 255) << 8 | k / 9 & 255; - } - - public static int getGrassColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, GRASS_COLOR); - } - - public static int getFoliageColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, WATER_COLOR); - } - - interface ColorProvider { - int getColorAtPos(Biome biome, BlockPos pos); - } -} - diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java deleted file mode 100644 index b681922..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorable { - int method_12155(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i); -} 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 deleted file mode 100644 index 5053ac7..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java +++ /dev/null @@ -1,95 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.*; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.FlowerPotBlockEntity; -import net.minecraft.item.Item; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public class BlockColors { - private final IdList BlockColor2Id = new IdList<>(32); - - public BlockColors() { - } - - public static BlockColors create() { - final BlockColors blockColors = new BlockColors(); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - 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) -> { - if (blockView != null && blockPos != null) { - BlockEntity blockEntity = blockView.getBlockEntity(blockPos); - if (blockEntity instanceof FlowerPotBlockEntity) { - Item item = ((FlowerPotBlockEntity) blockEntity).getItem(); - BlockState blockState2 = Block.getBlockFromItem(item).getDefaultState(); - return blockColors.method_12157(blockState2, blockView, blockPos, i); - } else { - return -1; - } - } else { - return -1; - } - }, 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 = blockState.get(Leaves1Block.VARIANT); - if (woodType == PlanksBlock.WoodType.SPRUCE) { - return net.minecraft.client.color.world.FoliageColors.getSpruceColor(); - } else if (woodType == PlanksBlock.WoodType.BIRCH) { - return net.minecraft.client.color.world.FoliageColors.getBirchColor(); - } else { - return blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(); - } - }, 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(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); - int k = j * 32; - int l = 255 - j * 8; - int m = j * 4; - return k << 16 | l << 8 | m; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - if (blockView != null && blockPos != null) { - return BiomeColors.getGrassColor(blockView, blockPos); - } else { - return blockState.get(TallPlantBlock.TYPE) == TallPlantBlock.GrassType.DEAD_BUSH ? 16777215 : GrassColors.getColor(0.5D, 1.0D); - } - }, Blocks.TALLGRASS); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.VINE); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int method_13410(BlockState blockState) { - BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock())); - if (blockColorable != null) { - return blockColorable.method_12155(blockState, null, null, 0); - } else { - MaterialColor materialColor = blockState.getMaterialColor(); - return materialColor != null ? materialColor.color : -1; - } - } - - public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) { - 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 (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 deleted file mode 100644 index f4d20ec..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 6396257; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } -} 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 deleted file mode 100644 index 0528f39..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,19 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - int k = j << 8 | i; - return k > colorMap.length ? -65281 : colorMap[k]; - } -} - - 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 deleted file mode 100644 index 75c9f89..0000000 --- a/1.11.2/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.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java deleted file mode 100644 index fd0b7ae..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/SkyColor.java +++ /dev/null @@ -1,74 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class SkyColor { - public static int getSkyColor(Biome biome) { - return realSkyColor(biome.getTemperature()); - } - - private static int realSkyColor(float temperature) { - temperature /= 3.0F; - temperature = MathHelper.clamp(temperature, -1.0F, 1.0F); - return hsvToRgb(0.62222224F - temperature * 0.05F, 0.5F + temperature * 0.1F, 1.0F); - } - - public static int hsvToRgb(float hue, float saturation, float value) { - int i = (int) (hue * 6.0F) % 6; - float f = hue * 6.0F - (float) i; - float g = value * (1.0F - saturation); - float h = value * (1.0F - f * saturation); - float j = value * (1.0F - (1.0F - f) * saturation); - float k; - float l; - float m; - switch (i) { - case 0: - k = value; - l = j; - m = g; - break; - case 1: - k = h; - l = value; - m = g; - break; - case 2: - k = g; - l = value; - m = j; - break; - case 3: - k = g; - l = h; - m = value; - break; - case 4: - k = j; - l = g; - m = value; - break; - case 5: - k = value; - l = g; - m = h; - break; - default: - throw new RuntimeException("Something went wrong when converting from HSV to RGB. Input was " + hue + ", " + saturation + ", " + value); - } - - int n = clamp((int) (k * 255.0F), 0, 255); - int o = clamp((int) (l * 255.0F), 0, 255); - int p = clamp((int) (m * 255.0F), 0, 255); - return n << 16 | o << 8 | p; - } - - public static int clamp(int value, int min, int max) { - if (value < min) { - return min; - } else { - return Math.min(value, max); - } - } -} 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 1453aa2..1433d78 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,6 @@ 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.mixin.BiomeAccessor; import net.minecraft.util.Identifier; import net.minecraft.util.registry.SimpleRegistry; @@ -23,7 +22,6 @@ public class BiomesDataGenerator implements IDataGenerator { public static JsonObject generateBiomeInfo(SimpleRegistry registry, Biome biome) { JsonObject biomeDesc = new JsonObject(); - Identifier registryKey = registry.getIdentifier(biome); biomeDesc.addProperty("id", registry.getRawId(biome)); biomeDesc.addProperty("name", String.join("_", ((BiomeAccessor) biome).name().toLowerCase(Locale.ENGLISH).split(" "))); @@ -33,7 +31,7 @@ public class BiomesDataGenerator implements IDataGenerator { biomeDesc.addProperty("depth", biome.getDepth()); biomeDesc.addProperty("dimension", guessBiomeDimensionFromCategory(biome)); biomeDesc.addProperty("displayName", ((BiomeAccessor) biome).name()); - biomeDesc.addProperty("color", SkyColor.getSkyColor(biome)); + biomeDesc.addProperty("color", biome.getSkyColor(biome.getTemperature())); biomeDesc.addProperty("rainfall", biome.getRainfall()); return biomeDesc; 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 47cac43..df1d554 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 @@ -6,11 +6,14 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.Registries; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; public class BlockCollisionShapesDataGenerator implements IDataGenerator { private static final Box ENTITY_BOX = new Box(0.0D, 0.0D, 0.0D, 1.0D, 2.0D, 1.0D); @@ -76,7 +79,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } } if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { - return indexesOfBoxesInTheShapesCache.get(0); + return indexesOfBoxesInTheShapesCache.getFirst(); } else { JsonArray shapeIndexes = new JsonArray(); indexesOfBoxesInTheShapesCache.forEach(shapeIndex -> shapeIndexes.add(new JsonPrimitive(shapeIndex))); @@ -96,18 +99,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 17c00e5..cb2c36f 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -4,7 +4,6 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -28,12 +27,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { 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 deleted file mode 100644 index c89d077..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 6aba51e..ea880e4 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(Registries.STATUS_EFFECTS.getIdentifier(statusEffect)); diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index cbfff2d..bd6cfcc 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -6,10 +6,14 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.Registries; -import net.minecraft.enchantment.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; import net.minecraft.util.Identifier; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Objects; public class EnchantmentsDataGenerator implements IDataGenerator { 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 b1b24cf..419f324 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 @@ -4,8 +4,14 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.Registries; -import net.minecraft.entity.*; -import net.minecraft.entity.mob.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.mob.AmbientEntity; +import net.minecraft.entity.mob.HostileEntity; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.entity.mob.WaterCreatureEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.player.PlayerEntity; @@ -18,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = Registries.ENTITY_TYPES.getIdentifier(entityClass); diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 66c5379..a5b65ce 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = Registries.ITEMS.getIdentifier(foodItem); diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 3aa51c4..dcb6c5b 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -4,8 +4,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.mixin.NoteBlockAccessor; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import java.util.Objects; @@ -19,10 +18,10 @@ public class InstrumentsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { JsonArray array = new JsonArray(); int i = 0; - for (SoundEvent sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { + for (Sound sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { JsonObject object = new JsonObject(); object.addProperty("id", i++); - object.addProperty("name", ((SoundAccessor) sound).id().getPath().split("\\.")[2]); + object.addProperty("name", sound.getId().getPath().split("\\.")[2]); array.add(object); } return array; diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 2b1a508..36025a4 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import net.minecraft.client.particle.ParticleType; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(int id, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..553fbdf 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,11 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 9429a29..88e0e8a 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,17 +2,14 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; - +import net.minecraft.sound.Sound; public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(SoundEvent soundEvent) { + public static JsonObject generateSound(Sound soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", SoundEvent.REGISTRY.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor) soundEvent).id().getPath()); + soundDesc.addProperty("id", Sound.REGISTRY.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -25,7 +22,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - SoundEvent.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); + Sound.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 401c2c5..3923b2e 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,37 +3,30 @@ 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.mixin.BiomeAccessor; -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - - private static final BlockColors blockColors = BlockColors.create(); - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public Biome getBiome(BlockPos pos) { - return biome; - } - }; - int biomeGrassColor = BiomeColors.getGrassColor(bv, BlockPos.ORIGIN); - int biomeFoliageColor = BiomeColors.getFoliageColor(bv, BlockPos.ORIGIN); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -44,30 +37,29 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getColorIntensity(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } private static int getBlockColor(Block block) { - return blockColors.method_13410(block.getDefaultState()); + return BlockColors.create().method_13410(block.getDefaultState()); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); @@ -157,8 +149,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java index 4bc3bcb..688aa1c 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java @@ -1,7 +1,7 @@ package dev.u9g.minecraftdatagenerator.mixin; import net.minecraft.block.NoteBlock; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -10,7 +10,7 @@ import java.util.List; @Mixin(NoteBlock.class) public interface NoteBlockAccessor { @Accessor("TUNES") - static List TUNES() { + static List TUNES() { return null; } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index fe50591..0000000 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.client.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index bf7137e..95094ee 100644 --- a/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.11.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,82 +1,20 @@ package dev.u9g.minecraftdatagenerator.util; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.internal.bind.TypeAdapters; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; -import java.io.IOException; - public class DGU { - - public static Gson gson = new GsonBuilder().registerTypeAdapterFactory(TypeAdapters.newFactory(double.class, Double.class, new TypeAdapter() { - @Override - public Number read(JsonReader in) throws IOException { - if (in.peek() == JsonToken.NULL) { - in.nextNull(); - return null; - } - return in.nextDouble(); - } - - @Override - public void write(JsonWriter out, Number value) throws IOException { - out.value(value); - } - })).create(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.11.2/src/main/resources/fabric.mod.json b/1.11.2/src/main/resources/fabric.mod.json index 03fbafe..ffac96b 100644 --- a/1.11.2/src/main/resources/fabric.mod.json +++ b/1.11.2/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.11" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.11.2/src/main/resources/minecraft-data-generator.mixins.json b/1.11.2/src/main/resources/minecraft-data-generator.mixins.json index fcdcd1a..cd1d518 100644 --- a/1.11.2/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.11.2/src/main/resources/minecraft-data-generator.mixins.json @@ -12,11 +12,8 @@ "MiningToolItemAccessor", "NoteBlockAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], - "client": [ - ], "injectors": { "defaultRequire": 1 }, diff --git a/1.12.2/build.gradle b/1.12.2/build.gradle index 057916c..300b1a8 100644 --- a/1.12.2/build.gradle +++ b/1.12.2/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.12.2" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.12.2/gradle.properties b/1.12.2/gradle.properties deleted file mode 100644 index bf25787..0000000 --- a/1.12.2/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.12.2 -yarn_mappings=1.12.2+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index 874569b..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,46 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - 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) { - int i = 0; - int j = 0; - 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) { - BlockPos.Mutable mutable = var6.next(); - l = provider.getColorAtPos(view.getBiome(mutable), mutable); - i += (l & 16711680) >> 16; - j += (l & '\uff00') >> 8; - } - - return (i / 9 & 255) << 16 | (j / 9 & 255) << 8 | k / 9 & 255; - } - - public static int getGrassColor(BlockView view, BlockPos pos) { - return getColor(view, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockView view, BlockPos pos) { - return getColor(view, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockView view, BlockPos pos) { - return getColor(view, pos, WATER_COLOR); - } - - interface ColorProvider { - int getColorAtPos(Biome biome, BlockPos pos); - } -} - 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 deleted file mode 100644 index 6480990..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorable { - int method_12155(BlockState blockState, @Nullable BlockView blockView, @Nullable BlockPos blockPos, int i); -} 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 deleted file mode 100644 index 51bf78c..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java +++ /dev/null @@ -1,98 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.block.*; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.FlowerPotBlockEntity; -import net.minecraft.item.Item; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -public class BlockColors { - private final IdList BlockColor2Id = new IdList<>(32); - - public BlockColors() { - } - - public static BlockColors create() { - final BlockColors blockColors = new BlockColors(); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - 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) -> { - if (blockView != null && blockPos != null) { - BlockEntity blockEntity = blockView.getBlockEntity(blockPos); - if (blockEntity instanceof FlowerPotBlockEntity) { - Item item = ((FlowerPotBlockEntity) blockEntity).getItem(); - BlockState blockState2 = Block.getBlockFromItem(item).getDefaultState(); - return blockColors.method_12157(blockState2, blockView, blockPos, i); - } else { - return -1; - } - } else { - return -1; - } - }, 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 = blockState.get(Leaves1Block.VARIANT); - if (woodType == PlanksBlock.WoodType.SPRUCE) { - return FoliageColors.getSpruceColor(); - } else if (woodType == PlanksBlock.WoodType.BIRCH) { - return FoliageColors.getBirchColor(); - } else { - return blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(); - } - }, 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(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); - int k = j * 32; - int l = 255 - j * 8; - int m = j * 4; - return k << 16 | l << 8 | m; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); -// blockColors.method_12158((blockState, blockView, blockPos, i) -> { -// if (blockView != null && blockPos != null) { -// return BiomeColors.getGrassColor(blockView, blockPos); -// } else { -// return blockState.get(TallPlantBlock.TYPE) == TallPlantBlock.GrassType.DEAD_BUSH ? 16777215 : GrassColors.getColor(0.5D, 1.0D); -// } -// }, Blocks.TALLGRASS); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getGrassColor(blockView, blockPos) : blockState.get(TallPlantBlock.TYPE) == TallPlantBlock.GrassType.DEAD_BUSH ? 16777215 : GrassColors.getColor(0.5D, 1.0D), Blocks.TALLGRASS); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.VINE); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int method_13410(BlockState blockState, World world, BlockPos blockPos) { - BlockColorable blockColorable = BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock())); - if (blockColorable != null) { - return blockColorable.method_12155(blockState, null, null, 0); - } else { - MaterialColor materialColor = blockState.getMaterialColor(world, blockPos); - return materialColor != null ? materialColor.color : -1; - } - } - - public int method_12157(BlockState blockState, @Nullable BlockView blockView, @Nullable BlockPos blockPos, int i) { - net.minecraft.client.BlockColorable blockColorable = (net.minecraft.client.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 (Block block : blocks) { - this.BlockColor2Id.set(blockColorable, Block.getIdByBlock(block)); - } - } -} diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index 1d3f948..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - private static int getColor(double temperature, double humidity) { - int i = (int) ((1.0 - temperature) * 255.0); - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 0x619961; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java deleted file mode 100644 index 9d65372..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - int i = (int) ((1.0 - temperature) * 255.0); - int k = j << 8 | i; - if (k > colorMap.length) { - return -65281; - } - return colorMap[k]; - } - - public static int getGrassColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} - 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 deleted file mode 100644 index f733e90..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java +++ /dev/null @@ -1,25 +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 0xFF000000 | k << 16 | l << 8 | m; - } -} 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 f687045..ba757ea 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 @@ -78,7 +78,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } } if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { - return indexesOfBoxesInTheShapesCache.get(0); + return indexesOfBoxesInTheShapesCache.getFirst(); } else { JsonArray shapeIndexes = new JsonArray(); indexesOfBoxesInTheShapesCache.forEach(shapeIndexes::add); @@ -98,18 +98,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cdc6711..ef5406f 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -3,7 +3,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -27,12 +26,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { 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 deleted file mode 100644 index c89d077..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 6aba51e..ea880e4 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(Registries.STATUS_EFFECTS.getIdentifier(statusEffect)); 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 5528e0b..4c2fd2e 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 @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = Registries.ENTITY_TYPES.getIdentifier(entityClass); diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 66c5379..a5b65ce 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = Registries.ITEMS.getIdentifier(foodItem); diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 3aa51c4..dcb6c5b 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -4,8 +4,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.mixin.NoteBlockAccessor; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import java.util.Objects; @@ -19,10 +18,10 @@ public class InstrumentsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { JsonArray array = new JsonArray(); int i = 0; - for (SoundEvent sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { + for (Sound sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { JsonObject object = new JsonObject(); object.addProperty("id", i++); - object.addProperty("name", ((SoundAccessor) sound).id().getPath().split("\\.")[2]); + object.addProperty("name", sound.getId().getPath().split("\\.")[2]); array.add(object); } return array; diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 2b1a508..36025a4 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import net.minecraft.client.particle.ParticleType; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(int id, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..553fbdf 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,11 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 2fced08..88e0e8a 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,14 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; - - +import net.minecraft.sound.Sound; public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(SoundEvent soundEvent) { + public static JsonObject generateSound(Sound soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", SoundEvent.REGISTRY.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor) soundEvent).id().getPath()); + soundDesc.addProperty("id", Sound.REGISTRY.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,7 +22,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - SoundEvent.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); + Sound.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 72c7951..72fc3d9 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,32 +2,32 @@ 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.mixin.BiomeAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - - private static final BlockColors blockColors = BlockColors.create(); - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - int biomeGrassColor = GrassColors.getGrassColor(biome); - int biomeFoliageColor = FoliageColors.getFoliageColor(biome); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -38,30 +38,29 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getColorIntensity(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } private static int getBlockColor(Block block) { - return blockColors.method_13410(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); + return BlockColors.create().method_13410(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); @@ -152,8 +151,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java index 4bc3bcb..688aa1c 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java @@ -1,7 +1,7 @@ package dev.u9g.minecraftdatagenerator.mixin; import net.minecraft.block.NoteBlock; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -10,7 +10,7 @@ import java.util.List; @Mixin(NoteBlock.class) public interface NoteBlockAccessor { @Accessor("TUNES") - static List TUNES() { + static List TUNES() { return null; } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index fe50591..0000000 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.client.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index bf7137e..95094ee 100644 --- a/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.12.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,82 +1,20 @@ package dev.u9g.minecraftdatagenerator.util; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.internal.bind.TypeAdapters; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; -import java.io.IOException; - public class DGU { - - public static Gson gson = new GsonBuilder().registerTypeAdapterFactory(TypeAdapters.newFactory(double.class, Double.class, new TypeAdapter() { - @Override - public Number read(JsonReader in) throws IOException { - if (in.peek() == JsonToken.NULL) { - in.nextNull(); - return null; - } - return in.nextDouble(); - } - - @Override - public void write(JsonWriter out, Number value) throws IOException { - out.value(value); - } - })).create(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.12.2/src/main/resources/fabric.mod.json b/1.12.2/src/main/resources/fabric.mod.json index 57c1113..ffac96b 100644 --- a/1.12.2/src/main/resources/fabric.mod.json +++ b/1.12.2/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.12" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.12.2/src/main/resources/minecraft-data-generator.mixins.json b/1.12.2/src/main/resources/minecraft-data-generator.mixins.json index fcdcd1a..cd1d518 100644 --- a/1.12.2/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.12.2/src/main/resources/minecraft-data-generator.mixins.json @@ -12,11 +12,8 @@ "MiningToolItemAccessor", "NoteBlockAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], - "client": [ - ], "injectors": { "defaultRequire": 1 }, diff --git a/1.13/build.gradle b/1.13/build.gradle index 057916c..1048f50 100644 --- a/1.13/build.gradle +++ b/1.13/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.13.2" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.13/gradle.properties b/1.13/gradle.properties deleted file mode 100644 index 495d46f..0000000 --- a/1.13/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.13.2 -yarn_mappings=1.13.2+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -fabric_version = 1.4.2+1.8.9 diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index a661211..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,49 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.RenderBlockView; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - private static final ColorProvider field_21146 = Biome::getGrassColor; - private static final ColorProvider field_21147 = Biome::getFoliageColor; - private static final ColorProvider field_21148 = (biome, blockPos) -> biome.getWaterColor(); - private static final ColorProvider field_21149 = (biome, blockPos) -> biome.method_16447(); - - private static int method_19682(RenderBlockView renderBlockView, BlockPos blockPos, ColorProvider colorProvider) { - int i = 0; - int j = 0; - int k = 0; - int l = MinecraftClient.getInstance().options.field_19979; - int m = (l * 2 + 1) * (l * 2 + 1); - - int n; - for (Iterator var8 = BlockPos.mutableIterate(blockPos.getX() - l, blockPos.getY(), blockPos.getZ() - l, blockPos.getX() + l, blockPos.getY(), blockPos.getZ() + l).iterator(); var8.hasNext(); k += n & 255) { - BlockPos.Mutable mutable = var8.next(); - n = colorProvider.getColor(renderBlockView.method_8577(mutable), mutable); - i += (n & 16711680) >> 16; - j += (n & '\uff00') >> 8; - } - - return (i / m & 255) << 16 | (j / m & 255) << 8 | k / m & 255; - } - - public static int method_19681(RenderBlockView renderBlockView, BlockPos blockPos) { - return method_19682(renderBlockView, blockPos, field_21146); - } - - public static int method_19684(RenderBlockView renderBlockView, BlockPos blockPos) { - return method_19682(renderBlockView, blockPos, field_21147); - } - - public static int method_19686(RenderBlockView renderBlockView, BlockPos blockPos) { - return method_19682(renderBlockView, blockPos, field_21148); - } - - interface ColorProvider { - int getColor(Biome biome, BlockPos 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 deleted file mode 100644 index f6baf12..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.RenderBlockView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorable { - int getColor(BlockState state, @Nullable RenderBlockView renderView, @Nullable BlockPos pos, int i); -} 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 deleted file mode 100644 index a372bf6..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java +++ /dev/null @@ -1,65 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.block.*; -import net.minecraft.class_2181; -import net.minecraft.class_3721; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.RenderBlockView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -public class BlockColors { - private final IdList BlockColor2Id = new IdList<>(32); - - public BlockColors() { - } - - public static BlockColors create() { - BlockColors blockColors = new BlockColors(); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? BiomeColors.method_19681(renderBlockView, blockState.getProperty(class_3721.field_18472) == class_2181.field_9374 ? blockPos.down() : blockPos) : -1, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? BiomeColors.method_19681(renderBlockView, blockPos) : GrassColors.getColor(0.5D, 1.0D), Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> net.minecraft.client.color.world.FoliageColors.getSpruceColor(), Blocks.SPRUCE_LEAVES); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> net.minecraft.client.color.world.FoliageColors.getBirchColor(), Blocks.BIRCH_LEAVES); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? BiomeColors.method_19684(renderBlockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.OAK_LEAVES, Blocks.JUNGLE_LEAVES, Blocks.ACACIA_LEAVES, Blocks.DARK_OAK_LEAVES, Blocks.VINE); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? BiomeColors.method_19686(renderBlockView, blockPos) : -1, Blocks.WATER, Blocks.BUBBLE_COLUMN, Blocks.CAULDRON); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> RedstoneWireBlock.method_8877(blockState.getProperty(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? BiomeColors.method_19681(renderBlockView, blockPos) : -1, Blocks.SUGAR_CANE); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> { - int j = blockState.getProperty(AttachedStemBlock.field_18518); - int k = j * 32; - int l = 255 - j * 8; - int m = j * 4; - return k << 16 | l << 8 | m; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.method_12158((blockState, renderBlockView, blockPos, i) -> renderBlockView != null && blockPos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int method_13410(BlockState blockState, World world, BlockPos blockPos) { - BlockColorable blockColorable = this.BlockColor2Id.fromId(Registry.BLOCK.getRawId(blockState.getBlock())); - if (blockColorable != null) { - return blockColorable.getColor(blockState, null, null, 0); - } else { - MaterialColor materialColor = blockState.method_16892(world, blockPos); - return materialColor != null ? materialColor.color : -1; - } - } - - public int method_18332(BlockState blockState, @Nullable RenderBlockView renderBlockView, @Nullable BlockPos blockPos, int i) { - BlockColorable blockColorable = this.BlockColor2Id.fromId(Registry.BLOCK.getRawId(blockState.getBlock())); - return blockColorable == null ? -1 : blockColorable.getColor(blockState, renderBlockView, blockPos, i); - } - - public void method_12158(BlockColorable blockColorable, Block... blocks) { - int var4 = blocks.length; - - for (Block block : blocks) { - this.BlockColor2Id.set(blockColorable, Registry.BLOCK.getRawId(block)); - } - - } -} - diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index 1d3f948..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - private static int getColor(double temperature, double humidity) { - int i = (int) ((1.0 - temperature) * 255.0); - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 0x619961; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java deleted file mode 100644 index 9d65372..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - int i = (int) ((1.0 - temperature) * 255.0); - int k = j << 8 | i; - if (k > colorMap.length) { - return -65281; - } - return colorMap[k]; - } - - public static int getGrassColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} - diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java deleted file mode 100644 index f733e90..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java +++ /dev/null @@ -1,25 +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 0xFF000000 | k << 16 | l << 8 | m; - } -} diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 573ffce..7aa4b76 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -38,8 +38,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -68,7 +68,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index d9d29c7..97ed20c 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -3,7 +3,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; @@ -26,13 +25,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; import java.util.stream.Collectors; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { return Registry.ITEM.stream() .filter(item -> item instanceof ToolItem) @@ -81,16 +76,16 @@ public class BlocksDataGenerator implements IDataGenerator { return propertyObject; } - public static JsonObject generateBlock(Registry blockRegistry, Block block) { + public static JsonObject generateBlock(Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getBlockStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getId(block); + Identifier registryKey = Registry.BLOCK.getId(block); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(block); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", Objects.requireNonNull(registryKey).getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -112,8 +107,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", block.getLightSubtracted(block.getDefaultState(), EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { stateProperties.add(generateStateProperty(property)); @@ -136,7 +131,7 @@ public class BlocksDataGenerator implements IDataGenerator { JsonArray resultBlocksArray = new JsonArray(); Registry blockRegistry = Registry.BLOCK; for (Block block : (Iterable) blockRegistry) { - resultBlocksArray.add(generateBlock(blockRegistry, block)); + resultBlocksArray.add(generateBlock(block)); } return resultBlocksArray; } 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 deleted file mode 100644 index 40660b6..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 33d93eb..3ceb104 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(registry.getId(statusEffect)); 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 d2db88d..b1fc039 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 @@ -24,7 +24,6 @@ import java.lang.reflect.ParameterizedType; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getId(entityType); diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 7ae7adf..9ae8046 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -12,7 +12,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getId(foodItem); diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 20f0b72..9ceabf1 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -9,12 +9,11 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class ParticlesDataGenerator implements IDataGenerator { - - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { + public static JsonObject generateParticleType(ParticleType particleType) { JsonObject effectDesc = new JsonObject(); - Identifier registryKey = registry.getId(particleType); + Identifier registryKey = Registry.PARTICLE_TYPE.getId(particleType); - effectDesc.addProperty("id", registry.getRawId(particleType)); + effectDesc.addProperty("id", Registry.PARTICLE_TYPE.getRawId(particleType)); effectDesc.addProperty("name", Objects.requireNonNull(registryKey).getPath()); return effectDesc; } @@ -24,13 +23,12 @@ public class ParticlesDataGenerator implements IDataGenerator { return "particles"; } + @SuppressWarnings("unchecked") @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry> particleTypeRegistry = Registry.PARTICLE_TYPE; - for (ParticleType particleType : (Iterable) particleTypeRegistry) { - resultsArray.add(generateParticleType(particleTypeRegistry, particleType)); - } + Registry.PARTICLE_TYPE.forEach(particleType -> + resultsArray.add(generateParticleType((ParticleType) particleType))); return resultsArray; } } diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 5e4587d..5017a28 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -118,4 +118,9 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } } diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index a6f3660..9fe0343 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(Registry registry, Sound soundEvent) { JsonObject soundDesc = new JsonObject(); soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,8 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, (SoundEvent) sound))); + Registry soundEventRegistry = Registry.SOUND_EVENT; + soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, (Sound) sound))); return resultsArray; } } 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 07935d7..f9fb265 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,28 +2,30 @@ 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.util.DGU; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : (Iterable) biomeRegistry) { - int biomeGrassColor = GrassColors.getGrassColor(biome); - int biomeFoliageColor = FoliageColors.getFoliageColor(biome); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = biome.getWaterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -34,33 +36,32 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getColorIntensity(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.method_13410(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); + private static int getBlockColor(Block block) { + return BlockColors.create().method_13410(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -151,8 +152,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index fe50591..0000000 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.client.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 4ce9292..96e72af 100644 --- a/1.13/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.13/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,10 +1,6 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.Itemable; import net.minecraft.server.MinecraftServer; @@ -14,48 +10,13 @@ import net.minecraft.world.dimension.DimensionType; import org.jetbrains.annotations.NotNull; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().translate(translationKey); } @NotNull diff --git a/1.13/src/main/resources/fabric.mod.json b/1.13/src/main/resources/fabric.mod.json index 1bd022a..ffac96b 100644 --- a/1.13/src/main/resources/fabric.mod.json +++ b/1.13/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.13" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.13/src/main/resources/minecraft-data-generator.mixins.json b/1.13/src/main/resources/minecraft-data-generator.mixins.json index 1024905..12957a1 100644 --- a/1.13/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.13/src/main/resources/minecraft-data-generator.mixins.json @@ -6,11 +6,8 @@ "mixins": [ "MiningToolItemAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], - "client": [ - ], "injectors": { "defaultRequire": 1 }, diff --git a/1.14/build.gradle b/1.14/build.gradle index d7f2e70..6d2f96b 100644 --- a/1.14/build.gradle +++ b/1.14/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.14" + + mappings { + intermediary() + yarnv1(21) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.14/gradle.properties b/1.14/gradle.properties deleted file mode 100644 index 8986e70..0000000 --- a/1.14/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.14 -yarn_mappings=1.14+build.21 -loader_version=0.13.3 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.3.0-pre+build.156 diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index 52a2020..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index f1068eb..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - int i = (int) ((1.0 - temperature) * 255.0); - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 0x619961; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} 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 deleted file mode 100644 index 9127091..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] is) { - colorMap = is; - } - - public static int getColor(double d, double e) { - int j = (int) ((1.0 - (e *= d)) * 255.0); - int i = (int) ((1.0 - d) * 255.0); - int k = j << 8 | i; - if (k > colorMap.length) { - return -65281; - } - return colorMap[k]; - } - - public static int getGrassColorAt(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} - diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java deleted file mode 100644 index f733e90..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java +++ /dev/null @@ -1,25 +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 0xFF000000 | k << 16 | l << 8 | m; - } -} diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index f7c4d66..bbaccfa 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -10,7 +10,6 @@ import net.minecraft.world.biome.Biome; import java.util.Objects; public class BiomesDataGenerator implements IDataGenerator { - private static String guessBiomeDimensionFromCategory(Biome biome) { return switch (biome.getCategory()) { case NETHER -> "nether"; diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 6f0d2d4..8c96da9 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -37,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -67,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 6c47c0e..e30871e 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -3,7 +3,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.block.AirBlock; @@ -29,13 +28,9 @@ import net.minecraft.world.loot.context.LootContextParameters; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; import java.util.stream.Collectors; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { return Registry.ITEM.stream() .filter(item -> item instanceof MiningToolItem) @@ -90,16 +85,16 @@ public class BlocksDataGenerator implements IDataGenerator { return propertyObject; } - public static JsonObject generateBlock(Registry blockRegistry, Block block) { + public static JsonObject generateBlock(Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateFactory().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getId(block); + Identifier registryKey = Registry.BLOCK.getId(block); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(block); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", Objects.requireNonNull(registryKey).getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -121,8 +116,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", block.getLightSubtracted(block.getDefaultState(), EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateFactory().getProperties()) { stateProperties.add(generateStateProperty(property)); @@ -149,9 +144,8 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = Registry.BLOCK; - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, block))); + Registry.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(block))); return resultBlocksArray; } } 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 deleted file mode 100644 index 40660b6..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 87620c0..52382cd 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getId(statusEffect); diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index 3df0725..e615864 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -16,19 +16,6 @@ import java.util.Objects; public class EnchantmentsDataGenerator implements IDataGenerator { private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") .put(EnchantmentTarget.ALL, "vanishable") // according to VanishingCurseEnchantment .build(); diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 1ab7c94..f14df2c 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,11 +17,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import org.jetbrains.annotations.NotNull; -import java.lang.reflect.ParameterizedType; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getId(entityType); @@ -47,17 +44,11 @@ public class EntitiesDataGenerator implements IDataGenerator { private static String getCategoryFrom(@NotNull EntityType entityType) { if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities - Class entityClazz = null; - try { - for (var field : EntityType.class.getFields()) - if (entityType == field.get(EntityType.class)) - entityClazz = (Class) ((ParameterizedType) TypeToken.get(field.getGenericType()).getType()).getActualTypeArguments()[0]; - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - if (entityClazz == null) throw new RuntimeException("Shouldn't be null..."); - return switch (entityClazz.getPackageName()) { + Entity entity = entityType.create(DGU.getWorld()); + if (entity == null) + throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); + entity.remove(); + return switch (entity.getClass().getPackageName()) { 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 +56,7 @@ public class EntitiesDataGenerator implements IDataGenerator { case "net.minecraft.entity.passive" -> "Passive mobs"; case "net.minecraft.entity.vehicle" -> "Vehicles"; case "net.minecraft.entity" -> "other"; - default -> throw new Error("Unexpected entity type: " + entityClazz.getPackageName()); + default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName()); }; } diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 2a0c137..4dc099c 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -10,7 +10,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getId(foodItem); diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index d537280..de81a65 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getId(particleType); diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 5e4587d..5017a28 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -118,4 +118,9 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } } diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 6fdecd6..585eb21 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 8ae3fda..33fa26b 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,6 @@ 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.util.DGU; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; @@ -12,21 +9,26 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.client.color.block.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); biomeRegistry.forEach(biome -> { - int biomeGrassColor = GrassColors.getGrassColorAt(biome); - int biomeFoliageColor = FoliageColors.getFoliageColor(biome); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = biome.getWaterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -37,33 +39,32 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getWireColor(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -159,8 +160,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } 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 53d5112..af7e9c1 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,19 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.create().getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index 34b44bc..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index d85a31d..1ad169d 100644 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,10 +1,6 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; @@ -14,48 +10,13 @@ import net.minecraft.world.dimension.DimensionType; import org.jetbrains.annotations.NotNull; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().translate(translationKey); } @NotNull diff --git a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java b/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java deleted file mode 100644 index b9d2864..0000000 --- a/1.14/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java +++ /dev/null @@ -1,57 +0,0 @@ -//package dev.u9g.minecraftdatagenerator.util; -// -//import net.minecraft.block.BlockState; -//import net.minecraft.block.Blocks; -//import net.minecraft.block.entity.BlockEntity; -//import net.minecraft.fluid.FluidState; -//import net.minecraft.fluid.Fluids; -//import net.minecraft.util.math.BlockPos; -//import net.minecraft.world.LightType; -//import net.minecraft.world.biome.Biomes; -//import net.minecraft.world.chunk.light.LightingProvider; -//import org.jetbrains.annotations.Nullable; -// -//public enum EmptyRenderBlockView implements BlockRenderView { -// INSTANCE; -// -// @Nullable -// public BlockEntity getBlockEntity(BlockPos pos) { -// return null; -// } -// -// public BlockState getBlockState(BlockPos pos) { -// return Blocks.AIR.getDefaultState(); -// } -// -// public FluidState getFluidState(BlockPos pos) { -// return Fluids.EMPTY.getDefaultState(); -// } -// -// public int getBottomY() { -// return 0; -// } -// -// public int getHeight() { -// return 0; -// } -// -// @Override -// public LightingProvider getLightingProvider() { -// return null; -// } -// -// @Override -// public int getColor(BlockPos pos, ColorResolver colorResolver) { -// return colorResolver.getColor(Biomes.PLAINS, pos.getX(), pos.getY()); -// } -// -// @Override -// public int getLightLevel(LightType type, BlockPos pos) { -// return type == LightType.SKY ? getMaxLightLevel() : 0; -// } -// -// @Override -// public int getBaseLightLevel(BlockPos pos, int ambientDarkness) { -// return ambientDarkness; -// } -//} diff --git a/1.14/src/main/resources/fabric.mod.json b/1.14/src/main/resources/fabric.mod.json index 060b263..ffac96b 100644 --- a/1.14/src/main/resources/fabric.mod.json +++ b/1.14/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "fabric": "*", - "minecraft": "1.14" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.14/src/main/resources/minecraft-data-generator.mixins.json b/1.14/src/main/resources/minecraft-data-generator.mixins.json index 1024905..ea255f5 100644 --- a/1.14/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.14/src/main/resources/minecraft-data-generator.mixins.json @@ -6,7 +6,6 @@ "mixins": [ "MiningToolItemAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], "client": [ diff --git a/1.15/build.gradle b/1.15/build.gradle index e85de39..bf10cc6 100644 --- a/1.15/build.gradle +++ b/1.15/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.15" + + mappings { + intermediary() + yarn(2) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.15/gradle.properties b/1.15/gradle.properties deleted file mode 100644 index 055fa5c..0000000 --- a/1.15/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.15 -yarn_mappings=1.15+build.2 -loader_version=0.13.3 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.28.5+1.15 diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index 52a2020..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index f1068eb..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - int i = (int) ((1.0 - temperature) * 255.0); - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 0x619961; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} 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 deleted file mode 100644 index ee6a498..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,27 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - int k = j << 8 | i; - return k > colorMap.length ? -65281 : colorMap[k]; - } - - public static int getGrassColorAt(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} - 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 deleted file mode 100644 index 5a21ac1..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.math.MathHelper; - -public class ServerSideRedstoneWireBlock { - private static final Vector3f[] data = new Vector3f[16]; - - static { - for (int i = 0; i <= 15; ++i) { - float f = 0; - float g = f * 0.6f + ((f = (float) i / 15.0f) > 0.0f ? 0.4f : 0.3f); - float h = MathHelper.clamp(f * f * 0.7f - 0.5f, 0.0f, 1.0f); - float j = MathHelper.clamp(f * f * 0.6f - 0.7f, 0.0f, 1.0f); - data[i] = new Vector3f(g, h, j); - } - } - - public static int getWireColor(int powerLevel) { - Vector3f vector3f = data[powerLevel]; - return packRgb(vector3f.getX(), vector3f.getY(), vector3f.getZ()); - } - - private static int packRgb(float r, float g, float b) { - return packRgb(MathHelper.floor(r * 255.0f), MathHelper.floor(g * 255.0f), MathHelper.floor(b * 255.0f)); - } - - private static int packRgb(int r, int g, int b) { - int i = r; - i = (i << 8) + g; - i = (i << 8) + b; - return i; - } -} diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 7bd1ec4..49ea216 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -37,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -67,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index e20bb43..6d056d7 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -3,7 +3,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.block.AirBlock; @@ -26,13 +25,9 @@ import net.minecraft.world.EmptyBlockView; import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import java.util.stream.Collectors; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { return Registry.ITEM.stream() .filter(item -> item instanceof MiningToolItem) @@ -85,16 +80,16 @@ public class BlocksDataGenerator implements IDataGenerator { return propertyObject; } - public static JsonObject generateBlock(Registry blockRegistry, Block block) { + public static JsonObject generateBlock(Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getId(block); + Identifier registryKey = Registry.BLOCK.getId(block); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(block); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -116,8 +111,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { stateProperties.add(generateStateProperty(property)); @@ -144,9 +139,8 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = Registry.BLOCK; - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, block))); + Registry.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(block))); return resultBlocksArray; } } 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 deleted file mode 100644 index 40660b6..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 87620c0..52382cd 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getId(statusEffect); diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index f4f067b..eb586c7 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -16,19 +16,6 @@ import java.util.Objects; public class EnchantmentsDataGenerator implements IDataGenerator { private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") .put(EnchantmentTarget.ALL, "vanishable") // according to VanishingCurseEnchantment .build(); diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index e80cded..0f05225 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,11 +17,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import org.jetbrains.annotations.NotNull; -import java.lang.reflect.ParameterizedType; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getId(entityType); @@ -47,26 +44,20 @@ public class EntitiesDataGenerator implements IDataGenerator { private static String getCategoryFrom(@NotNull EntityType entityType) { if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities - Class entityClazz = null; - try { - for (var field : EntityType.class.getFields()) - if (entityType == field.get(EntityType.class)) - entityClazz = (Class) ((ParameterizedType) TypeToken.get(field.getGenericType()).getType()).getActualTypeArguments()[0]; - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - if (entityClazz == null) throw new RuntimeException("Shouldn't be null..."); - return switch (entityClazz.getPackageName()) { + Entity entity = entityType.create(DGU.getWorld()); + if (entity == null) + throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); + entity.remove(); + return switch (entity.getClass().getPackageName()) { 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"; - case "net.minecraft.entity.projectile", "net.minecraft.entity.projectile.thrown", "net.minecraft.entity.thrown" -> - "Projectiles"; + case "net.minecraft.entity.projectile", "net.minecraft.entity.projectile.thrown", + "net.minecraft.entity.thrown" -> "Projectiles"; case "net.minecraft.entity.passive" -> "Passive mobs"; case "net.minecraft.entity.vehicle" -> "Vehicles"; case "net.minecraft.entity" -> "other"; - default -> throw new Error("Unexpected entity type: " + entityClazz.getPackageName()); + default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName()); }; } diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index fc494d1..d7e163e 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getId(foodItem); diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index d537280..de81a65 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getId(particleType); diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 5e4587d..5017a28 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -118,4 +118,9 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } } diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 6fdecd6..585eb21 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 0792641..a489cdb 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,32 +2,33 @@ 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.util.EmptyRenderBlockView; import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.client.color.block.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); biomeRegistry.forEach(biome -> { - int biomeGrassColor = GrassColors.getGrassColorAt(biome); - int biomeFoliageColor = FoliageColors.getFoliageColor(biome); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = biome.getWaterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -38,35 +39,32 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getWireColor(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } - @Environment(EnvType.CLIENT) - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } - @Environment(EnvType.CLIENT) public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -162,8 +160,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } 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 53d5112..af7e9c1 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,19 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.create().getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index 34b44bc..0000000 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index c5cdc36..f1ef277 100644 --- a/1.15/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.15/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,10 +1,6 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; @@ -14,48 +10,13 @@ import net.minecraft.world.dimension.DimensionType; import org.jetbrains.annotations.NotNull; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().translate(translationKey); } @NotNull diff --git a/1.15/src/main/resources/fabric.mod.json b/1.15/src/main/resources/fabric.mod.json index 3ee60ac..ffac96b 100644 --- a/1.15/src/main/resources/fabric.mod.json +++ b/1.15/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "fabric": "*", - "minecraft": "1.15" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.15/src/main/resources/minecraft-data-generator.mixins.json b/1.15/src/main/resources/minecraft-data-generator.mixins.json index 1024905..ea255f5 100644 --- a/1.15/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.15/src/main/resources/minecraft-data-generator.mixins.json @@ -6,7 +6,6 @@ "mixins": [ "MiningToolItemAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], "client": [ diff --git a/1.16/build.gradle b/1.16/build.gradle index e85de39..d97c3a5 100644 --- a/1.16/build.gradle +++ b/1.16/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.16" + + mappings { + intermediary() + yarn(4) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.16/gradle.properties b/1.16/gradle.properties deleted file mode 100644 index 3fe3c1b..0000000 --- a/1.16/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.16 -yarn_mappings=1.16+build.4 -loader_version=0.13.3 -# Dependencies -# check this on https://modmuss50.me/fabric.html -# fabric_version=0.36.0+1.17 -fabric_version=0.13.1+build.370-1.16 diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index 52a2020..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index f1068eb..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - int i = (int) ((1.0 - temperature) * 255.0); - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 0x619961; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} 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 deleted file mode 100644 index 9452d37..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - int j = (int) ((1.0 - (humidity *= temperature)) * 255.0); - int i = (int) ((1.0 - temperature) * 255.0); - int k = j << 8 | i; - if (k > colorMap.length) { - return -65281; - } - return colorMap[k]; - } - - public static int getGrassColorAt(Biome biome) { - double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); - double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); - return getColor(d, e); - } -} - 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 deleted file mode 100644 index 5a21ac1..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.client.util.math.Vector3f; -import net.minecraft.util.math.MathHelper; - -public class ServerSideRedstoneWireBlock { - private static final Vector3f[] data = new Vector3f[16]; - - static { - for (int i = 0; i <= 15; ++i) { - float f = 0; - float g = f * 0.6f + ((f = (float) i / 15.0f) > 0.0f ? 0.4f : 0.3f); - float h = MathHelper.clamp(f * f * 0.7f - 0.5f, 0.0f, 1.0f); - float j = MathHelper.clamp(f * f * 0.6f - 0.7f, 0.0f, 1.0f); - data[i] = new Vector3f(g, h, j); - } - } - - public static int getWireColor(int powerLevel) { - Vector3f vector3f = data[powerLevel]; - return packRgb(vector3f.getX(), vector3f.getY(), vector3f.getZ()); - } - - private static int packRgb(float r, float g, float b) { - return packRgb(MathHelper.floor(r * 255.0f), MathHelper.floor(g * 255.0f), MathHelper.floor(b * 255.0f)); - } - - private static int packRgb(int r, int g, int b) { - int i = r; - i = (i << 8) + g; - i = (i << 8) + b; - return i; - } -} diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index d5c7ca0..2eba27c 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -3,7 +3,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.block.AirBlock; @@ -29,13 +28,9 @@ import net.minecraft.world.EmptyBlockView; import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import java.util.stream.Collectors; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { return Registry.ITEM.stream() .filter(item -> item instanceof MiningToolItem) @@ -92,16 +87,16 @@ public class BlocksDataGenerator implements IDataGenerator { return propertyObject; } - public static JsonObject generateBlock(Registry blockRegistry, Block block) { + public static JsonObject generateBlock(Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(block); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -123,8 +118,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { stateProperties.add(generateStateProperty(property)); @@ -151,9 +146,8 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = Registry.BLOCK; - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, block))); + Registry.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(block))); return resultBlocksArray; } } 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 deleted file mode 100644 index 40660b6..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 18a9dcd..3ae99a6 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..4444934 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -11,29 +10,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index d0edd6c..207ee73 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -19,10 +18,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import org.jetbrains.annotations.NotNull; -import java.lang.reflect.ParameterizedType; - public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -48,17 +44,11 @@ public class EntitiesDataGenerator implements IDataGenerator { private static String getCategoryFrom(@NotNull EntityType entityType) { if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities - Class entityClazz = null; - try { - for (var field : EntityType.class.getFields()) - if (entityType == field.get(EntityType.class)) - entityClazz = (Class) ((ParameterizedType) TypeToken.get(field.getGenericType()).getType()).getActualTypeArguments()[0]; - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - if (entityClazz == null) throw new RuntimeException("Shouldn't be null..."); - return switch (entityClazz.getPackageName()) { + Entity entity = entityType.create(DGU.getWorld()); + if (entity == null) + throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); + entity.remove(); + return switch (entity.getClass().getPackageName()) { 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"; @@ -66,7 +56,7 @@ public class EntitiesDataGenerator implements IDataGenerator { case "net.minecraft.entity.passive" -> "Passive mobs"; case "net.minecraft.entity.vehicle" -> "Vehicles"; case "net.minecraft.entity" -> "other"; - default -> throw new Error("Unexpected entity type: " + entityClazz.getPackageName()); + default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName()); }; } diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 5e4587d..5017a28 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -118,4 +118,9 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } } diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 6fdecd6..585eb21 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 f480e93..689b5ac 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,33 +2,34 @@ 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.mixin.BiomeEffectsAccessor; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; import net.minecraft.client.color.block.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); biomeRegistry.forEach(biome -> { - int biomeGrassColor = GrassColors.getGrassColorAt(biome); - int biomeFoliageColor = FoliageColors.getFoliageColor(biome); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeEffectsAccessor) biome.getEffects()).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -39,35 +40,32 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getWireColor(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } - @Environment(EnvType.CLIENT) - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } - @Environment(EnvType.CLIENT) public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -163,8 +161,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } 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 3fe886a..4ba04e4 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,19 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.field_25319.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index 34b44bc..0000000 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 91eed91..af2897a 100644 --- a/1.16/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.16/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,58 +1,19 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Language; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.get(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } @NotNull diff --git a/1.16/src/main/resources/fabric.mod.json b/1.16/src/main/resources/fabric.mod.json index 9d66867..ffac96b 100644 --- a/1.16/src/main/resources/fabric.mod.json +++ b/1.16/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "fabric": "*", - "minecraft": "1.16" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.16/src/main/resources/minecraft-data-generator.mixins.json b/1.16/src/main/resources/minecraft-data-generator.mixins.json index 95ede1c..7154c90 100644 --- a/1.16/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.16/src/main/resources/minecraft-data-generator.mixins.json @@ -8,7 +8,6 @@ "EULAMixin", "MiningToolItemAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], "client": [ diff --git a/1.17/build.gradle b/1.17/build.gradle index e85de39..71a3643 100644 --- a/1.17/build.gradle +++ b/1.17/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.17" + + mappings { + intermediary() + yarn(9) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.17/gradle.properties b/1.17/gradle.properties deleted file mode 100644 index e181bfd..0000000 --- a/1.17/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.17 -yarn_mappings=1.17+build.13 -loader_version=0.13.3 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.36.0+1.17 diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5113965..cb40742 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -192,7 +192,7 @@ public class BlocksDataGenerator implements IDataGenerator { Registry blockRegistry = Registry.BLOCK; List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index 04792b7..0000000 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,79 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.lwjgl.system.CallbackI; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 1c9849e..9b4beb5 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..4444934 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -11,29 +10,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 8d94a6b..29e7ee2 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -18,7 +18,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 3b96085..9c5bfd7 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -41,7 +40,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -53,13 +52,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -106,14 +105,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = Registry.ITEM; - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -132,7 +131,7 @@ public class MaterialsDataGenerator implements IDataGenerator { Tag effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 6fdecd6..585eb21 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 3ceef91..5a28718 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -4,7 +4,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -20,7 +19,6 @@ import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -37,7 +35,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -46,26 +44,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - @Environment(EnvType.CLIENT) - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } - @Environment(EnvType.CLIENT) public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -161,8 +156,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java deleted file mode 100644 index 40e926a..0000000 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import com.google.common.base.Preconditions; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerInteractionManager; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; -import org.objectweb.asm.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(ClientPlayerInteractionManager.class) -public abstract class ClientPlayerInteractionManagerMixin { - @Unique - private long blockBreakingStartTicks; - @Unique - private BlockState stateBeingBroken; - - @Inject(method = "attackBlock", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;currentBreakingProgress:F", opcode = Opcodes.PUTFIELD)) - private void onBlockAttacked(BlockPos pos, Direction direction, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.blockBreakingStartTicks = world.getTime(); - } - - @Inject(method = "cancelBlockBreaking", at = @At("HEAD")) - private void onBlockBreakingCanceled(CallbackInfo callbackInfo) { - this.blockBreakingStartTicks = -1L; - } - - @Inject(method = "breakBlock", at = @At("HEAD")) - private void onBreakBlockHead(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.stateBeingBroken = world.getBlockState(pos); - } - - @Inject(method = "breakBlock", at = @At("RETURN")) - private void onBreakBlockReturn(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - if (callbackInfo.getReturnValue()) { - Preconditions.checkNotNull(stateBeingBroken); - if (blockBreakingStartTicks != -1L) { - long totalTicksElapsed = world.getTime() - this.blockBreakingStartTicks; - long totalTimeElapsed = totalTicksElapsed * 50L; - System.out.printf("Breaking block %s took %dms%n", stateBeingBroken.getBlock(), totalTimeElapsed); - } else { - System.out.printf("Breaking block %s took 0ms [INSTANT BREAK]%n", stateBeingBroken.getBlock()); - } - } - this.blockBreakingStartTicks = -1L; - } -} 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 b0b039f..759563e 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.GAME_VERSION.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.GAME_VERSION.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index 34b44bc..0000000 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 5945fa0..3946c1f 100644 --- a/1.17/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.17/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,57 +1,18 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.get(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.17/src/main/resources/fabric.mod.json b/1.17/src/main/resources/fabric.mod.json index 951064b..ffac96b 100644 --- a/1.17/src/main/resources/fabric.mod.json +++ b/1.17/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "fabric": "*", - "minecraft": "1.17" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.17/src/main/resources/minecraft-data-generator.mixins.json b/1.17/src/main/resources/minecraft-data-generator.mixins.json index d5bc0ee..b8f9bb3 100644 --- a/1.17/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.17/src/main/resources/minecraft-data-generator.mixins.json @@ -4,10 +4,8 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ClientPlayerInteractionManagerMixin", "MiningToolItemAccessor", - "ReadyMixin", - "SoundAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.18/build.gradle b/1.18/build.gradle index e85de39..ae4095d 100644 --- a/1.18/build.gradle +++ b/1.18/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.18" + + mappings { + intermediary() + yarn(1) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.18/gradle.properties b/1.18/gradle.properties deleted file mode 100644 index a13d73a..0000000 --- a/1.18/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.18 -yarn_mappings=1.18+build.1 -loader_version=0.14.4 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.44.0+1.18 diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 3c08245..077937e 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -104,7 +104,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -114,25 +114,25 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("hardness", block.getHardness()); blockDesc.addProperty("resistance", block.getBlastResistance()); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { stateProperties.add(generateStateProperty(property)); @@ -140,7 +140,7 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.add("states", stateProperties); // Let's not generate block drops... // List actualBlockDrops = new ArrayList<>(); - // populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + // populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); // for (ItemStack dropStack : actualBlockDrops) { // dropsArray.add(Item.getRawId(dropStack.getItem())); @@ -184,7 +184,7 @@ public class BlocksDataGenerator implements IDataGenerator { Registry blockRegistry = Registry.BLOCK; List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index 2abb628..0000000 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,75 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import dev.u9g.minecraftdatagenerator.util.DGU; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - DGU.JSON_ELEMENT.write(DGU.GSON.newJsonWriter(writer), outputElement); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 1c9849e..9b4beb5 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..4444934 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -11,29 +10,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 8d94a6b..29e7ee2 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -18,7 +18,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 3b96085..5dcbb06 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -41,7 +40,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -53,16 +52,19 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) - .forEach(resultingToolSpeeds::putAll); + .forEach(v -> { + System.out.println(v); + resultingToolSpeeds.putAll(v); + }); allMaterials.put(compositeMaterialName, resultingToolSpeeds); } @@ -106,14 +108,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = Registry.ITEM; - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -132,7 +134,7 @@ public class MaterialsDataGenerator implements IDataGenerator { Tag effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 6fdecd6..585eb21 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,18 +2,15 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor)soundEvent).id().getPath()); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 3ceef91..5a28718 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -4,7 +4,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -20,7 +19,6 @@ import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -37,7 +35,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -46,26 +44,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - @Environment(EnvType.CLIENT) - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } - @Environment(EnvType.CLIENT) public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -161,8 +156,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java deleted file mode 100644 index 40e926a..0000000 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import com.google.common.base.Preconditions; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerInteractionManager; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; -import org.objectweb.asm.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(ClientPlayerInteractionManager.class) -public abstract class ClientPlayerInteractionManagerMixin { - @Unique - private long blockBreakingStartTicks; - @Unique - private BlockState stateBeingBroken; - - @Inject(method = "attackBlock", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;currentBreakingProgress:F", opcode = Opcodes.PUTFIELD)) - private void onBlockAttacked(BlockPos pos, Direction direction, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.blockBreakingStartTicks = world.getTime(); - } - - @Inject(method = "cancelBlockBreaking", at = @At("HEAD")) - private void onBlockBreakingCanceled(CallbackInfo callbackInfo) { - this.blockBreakingStartTicks = -1L; - } - - @Inject(method = "breakBlock", at = @At("HEAD")) - private void onBreakBlockHead(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.stateBeingBroken = world.getBlockState(pos); - } - - @Inject(method = "breakBlock", at = @At("RETURN")) - private void onBreakBlockReturn(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - if (callbackInfo.getReturnValue()) { - Preconditions.checkNotNull(stateBeingBroken); - if (blockBreakingStartTicks != -1L) { - long totalTicksElapsed = world.getTime() - this.blockBreakingStartTicks; - long totalTimeElapsed = totalTicksElapsed * 50L; - System.out.printf("Breaking block %s took %dms%n", stateBeingBroken.getBlock(), totalTimeElapsed); - } else { - System.out.printf("Breaking block %s took 0ms [INSTANT BREAK]%n", stateBeingBroken.getBlock()); - } - } - this.blockBreakingStartTicks = -1L; - } -} 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 ba3b26b..c904c15 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index 34b44bc..0000000 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - - -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index dfb640d..3946c1f 100644 --- a/1.18/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.18/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,143 +1,18 @@ package dev.u9g.minecraftdatagenerator.util; -import com.google.gson.*; -import com.google.gson.internal.LazilyParsedNumber; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonWriter; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Language; import net.minecraft.world.World; -import java.io.IOException; -import java.util.Map; - public class DGU { - - public static final TypeAdapter JSON_ELEMENT = new TypeAdapter<>() { - @Override - public JsonElement read(JsonReader in) throws IOException { - switch (in.peek()) { - case STRING: - return new JsonPrimitive(in.nextString()); - case NUMBER: - String number = in.nextString(); - return new JsonPrimitive(new LazilyParsedNumber(number)); - case BOOLEAN: - return new JsonPrimitive(in.nextBoolean()); - case NULL: - in.nextNull(); - return JsonNull.INSTANCE; - case BEGIN_ARRAY: - JsonArray array = new JsonArray(); - in.beginArray(); - while (in.hasNext()) { - array.add(read(in)); - } - in.endArray(); - return array; - case BEGIN_OBJECT: - JsonObject object = new JsonObject(); - in.beginObject(); - while (in.hasNext()) { - object.add(in.nextName(), read(in)); - } - in.endObject(); - return object; - case END_DOCUMENT: - case NAME: - case END_OBJECT: - case END_ARRAY: - default: - throw new IllegalArgumentException(); - } - } - - @Override - public void write(JsonWriter out, JsonElement value) throws IOException { - if (value == null || value.isJsonNull()) { - out.nullValue(); - } else if (value.isJsonPrimitive()) { - JsonPrimitive primitive = value.getAsJsonPrimitive(); - if (primitive.isNumber()) { - if (primitive.getAsDouble() == primitive.getAsLong()) { - out.value(primitive.getAsLong()); - } else { - out.value(primitive.getAsNumber()); - } - } else if (primitive.isBoolean()) { - out.value(primitive.getAsBoolean()); - } else { - out.value(primitive.getAsString()); - } - - } else if (value.isJsonArray()) { - out.beginArray(); - for (JsonElement e : value.getAsJsonArray()) { - write(out, e); - } - out.endArray(); - - } else if (value.isJsonObject()) { - out.beginObject(); - for (Map.Entry e : value.getAsJsonObject().entrySet()) { - out.name(e.getKey()); - write(out, e.getValue()); - } - out.endObject(); - - } else { - throw new IllegalArgumentException("Couldn't write " + value.getClass()); - } - } - }; - public static final Gson GSON = new GsonBuilder() - .registerTypeAdapter(JsonElement.class, JSON_ELEMENT).setPrettyPrinting().create(); - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.get(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.18/src/main/resources/fabric.mod.json b/1.18/src/main/resources/fabric.mod.json index 4eeec5d..ffac96b 100644 --- a/1.18/src/main/resources/fabric.mod.json +++ b/1.18/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.4", - "fabric": "*", - "minecraft": "1.18" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.18/src/main/resources/minecraft-data-generator.mixins.json b/1.18/src/main/resources/minecraft-data-generator.mixins.json index 0867f2e..d46bf65 100644 --- a/1.18/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.18/src/main/resources/minecraft-data-generator.mixins.json @@ -4,11 +4,9 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ClientPlayerInteractionManagerMixin", "EULAMixin", "MiningToolItemAccessor", - "ReadyMixin", - "SoundAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.19.2/build.gradle b/1.19.2/build.gradle index e85de39..6d565ae 100644 --- a/1.19.2/build.gradle +++ b/1.19.2/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.19.2" + + mappings { + intermediary() + yarn(9) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties deleted file mode 100644 index ff2fb68..0000000 --- a/1.19.2/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.28 -loader_version=0.14.10 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.67.0+1.19.2 diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index 88200df..e53f198 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -2,35 +2,25 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.TheEndBiomeDataAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; -import net.fabricmc.fabric.api.biome.v1.NetherBiomes; +import net.minecraft.tag.BiomeTags; import net.minecraft.util.Identifier; +import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; -import java.util.HashSet; -import java.util.Set; - public class BiomesDataGenerator implements IDataGenerator { - private static final Set> END_BIOMES = new HashSet<>(); - - static { - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BIOMES_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BARRENS_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_MIDLANDS_MAP().keySet()); - } - - private static String guessBiomeDimensionFromCategory(Biome biome, String biomeName) { - var key = DynamicRegistryManager.BUILTIN.get().get(Registry.BIOME_KEY).getKey(biome).orElseThrow(); - if (NetherBiomes.canGenerateInNether(key)) { + private static String guessBiomeDimensionFromCategory(RegistryKey biome) { + var biomeRegistry = BuiltinRegistries.BIOME; + if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_NETHER)) { return "nether"; - } else if (END_BIOMES.contains(key) || biomeName.startsWith("end_")) { + } else if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_END)) { return "end"; + } else { + return "overworld"; } - return "overworld"; } private static String guessCategoryBasedOnName(String name, String dimension) { @@ -86,211 +76,22 @@ public class BiomesDataGenerator implements IDataGenerator { } } - private static int getBiomeColorFor(String biomeName) { - switch (biomeName) { - case "the_void" -> { - return 0; - } - case "plains" -> { - return 9286496; - } - case "sunflower_plains" -> { - return 11918216; - } - case "snowy_plains" -> { - return 16777215; - } - case "ice_spikes" -> { - return 11853020; - } - case "desert" -> { - return 16421912; - } - case "swamp" -> { - return 522674; - } - case "forest" -> { - return 353825; - } - case "flower_forest" -> { - return 2985545; - } - case "birch_forest" -> { - return 3175492; - } - case "dark_forest" -> { - return 4215066; - } - case "old_growth_birch_forest" -> { - return 5807212; - } - case "old_growth_pine_taiga" -> { - return 5858897; - } - case "old_growth_spruce_taiga" -> { - return 8490617; - } - case "taiga" -> { - return 747097; - } - case "snowy_taiga" -> { - return 3233098; - } - case "savanna" -> { - return 12431967; - } - case "savanna_plateau" -> { - return 10984804; - } - case "windswept_hills" -> { - return 6316128; - } - case "windswept_gravelly_hills" -> { - return 8947848; - } - case "windswept_forest" -> { - return 2250012; - } - case "windswept_savanna" -> { - return 15063687; - } - case "jungle" -> { - return 5470985; - } - case "sparse_jungle" -> { - return 6458135; - } - case "bamboo_jungle" -> { - return 7769620; - } - case "badlands" -> { - return 14238997; - } - case "eroded_badlands" -> { - return 16739645; - } - case "wooded_badlands" -> { - return 11573093; - } - case "meadow" -> { - return 9217136; - } - case "grove" -> { - return 14675173; - } - case "snowy_slopes" -> { - return 14348785; - } - case "frozen_peaks" -> { - return 15399931; - } - case "jagged_peaks" -> { - return 14937325; - } - case "stony_peaks" -> { - return 13750737; - } - case "river" -> { - return 255; - } - case "frozen_river" -> { - return 10526975; - } - case "beach" -> { - return 16440917; - } - case "snowy_beach" -> { - return 16445632; - } - case "stony_shore" -> { - return 10658436; - } - case "warm_ocean" -> { - return 172; - } - case "lukewarm_ocean" -> { - return 144; - } - case "deep_lukewarm_ocean" -> { - return 64; - } - case "ocean" -> { - return 112; - } - case "deep_ocean" -> { - return 48; - } - case "cold_ocean" -> { - return 2105456; - } - case "deep_cold_ocean" -> { - return 2105400; - } - case "frozen_ocean" -> { - return 7368918; - } - case "deep_frozen_ocean" -> { - return 4210832; - } - case "mushroom_fields" -> { - return 16711935; - } - case "dripstone_caves" -> { - return 12690831; - } - case "lush_caves" -> { - return 14652980; - } - case "nether_wastes" -> { - return 12532539; - } - case "warped_forest" -> { - return 4821115; - } - case "crimson_forest" -> { - return 14485512; - } - case "soul_sand_valley" -> { - return 6174768; - } - case "basalt_deltas" -> { - return 4208182; - } - case "the_end" -> { - return 8421631; - } - case "end_highlands" -> { - return 12828041; - } - case "end_midlands" -> { - return 15464630; - } - case "small_end_islands" -> { - return 42; - } - case "end_barrens" -> { - return 9474162; - } - } - System.out.println("Don't know the color of biome: '" + biomeName + "'"); - return 0; - } - public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { JsonObject biomeDesc = new JsonObject(); - Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); - String localizationKey = String.format("biome.%s.%s", registryKey.getNamespace(), registryKey.getPath()); - String name = registryKey.getPath(); + RegistryKey registryKey = registry.getKey(biome).orElseThrow(); + Identifier identifier = registryKey.getValue(); + String localizationKey = String.format("biome.%s.%s", identifier.getNamespace(), identifier.getPath()); + String name = identifier.getPath(); biomeDesc.addProperty("id", registry.getRawId(biome)); biomeDesc.addProperty("name", name); - String dimension = guessBiomeDimensionFromCategory(biome, name); + String dimension = guessBiomeDimensionFromCategory(registryKey); biomeDesc.addProperty("category", guessCategoryBasedOnName(name, dimension)); biomeDesc.addProperty("temperature", biome.getTemperature()); biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName()); //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source biomeDesc.addProperty("dimension", dimension); biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); - biomeDesc.addProperty("color", getBiomeColorFor(registryKey.getPath())); + biomeDesc.addProperty("color", biome.getSkyColor()); biomeDesc.addProperty("rainfall", biome.getDownfall()); return biomeDesc; diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5113965..cb40742 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -192,7 +192,7 @@ public class BlocksDataGenerator implements IDataGenerator { Registry blockRegistry = Registry.BLOCK; List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index ebf2ed5..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,78 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 1c9849e..9b4beb5 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..4444934 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -11,29 +10,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 4eacf20..703aead 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.EntityTypeAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -19,7 +18,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -47,11 +45,8 @@ public class EntitiesDataGenerator implements IDataGenerator { } private static String getCategoryFrom(EntityType entityType) { - if (entityType == EntityType.PLAYER) return "UNKNOWN"; // fail early for player entities - /*public T create(World world) { - return this.factory.create(this, world); - }*/ - Entity entity = ((EntityTypeAccessor) entityType).factory().create(entityType, DGU.getWorld()); + if (entityType == EntityType.PLAYER) return "UNKNOWN"; + Entity entity = entityType.create(DGU.getWorld()); if (entity == null) throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); entity.discard(); diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 4253ae6..1739de2 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -40,7 +39,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -52,13 +51,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -105,14 +104,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = Registry.ITEM; - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -131,7 +130,7 @@ public class MaterialsDataGenerator implements IDataGenerator { TagKey effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d063f71..53afb13 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -5,13 +5,11 @@ import com.google.gson.JsonObject; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)+1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead. + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead. soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; @@ -25,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index dda76c5..5cd4ad1 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -2,11 +2,11 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mojangannoyances.BlockColors; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.world.FoliageColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; @@ -14,13 +14,9 @@ import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -37,7 +33,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -46,24 +42,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -154,8 +149,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java deleted file mode 100644 index 3e62bf5..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(EntityType.class) -public interface EntityTypeAccessor { - @Accessor("factory") - EntityType.EntityFactory factory(); -} 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 ba3b26b..c904c15 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java deleted file mode 100644 index 2796b2a..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -import net.fabricmc.fabric.impl.biome.WeightedPicker; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - - -@Mixin(TheEndBiomeData.class) -public interface TheEndBiomeDataAccessor { - @Accessor(value = "END_BIOMES_MAP", remap = false) - static Map, WeightedPicker>> END_BIOMES_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_MIDLANDS_MAP", remap = false) - static Map, WeightedPicker>> END_MIDLANDS_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_BARRENS_MAP", remap = false) - static Map, WeightedPicker>> END_BARRENS_MAP() { - throw new IllegalStateException("Should never be called."); - } -} diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java deleted file mode 100644 index bb9ae83..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.level.ColorResolver; - -@Environment(EnvType.CLIENT) -public class BiomeColors { - public static final ColorResolver GRASS_COLOR = Biome::getGrassColorAt; - public static final ColorResolver FOLIAGE_COLOR = (biome, x, z) -> biome.getFoliageColor(); - public static final ColorResolver WATER_COLOR = (biome, x, z) -> biome.getWaterColor(); - - public BiomeColors() { - } - - private static int getColor(BlockRenderView world, BlockPos pos, ColorResolver resolver) { - return world.getColor(pos, resolver); - } - - public static int getGrassColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, WATER_COLOR); - } -} - diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java deleted file mode 100644 index ac5dc57..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorProvider { - int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex); -} - 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 deleted file mode 100644 index e8430eb..0000000 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java +++ /dev/null @@ -1,93 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import net.minecraft.block.*; -import net.minecraft.block.enums.DoubleBlockHalf; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.client.color.world.GrassColors; -import net.minecraft.state.property.Property; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.Map; -import java.util.Set; - -public class BlockColors { - private static final int NO_COLOR = -1; - private final IdList providers = new IdList<>(32); - private final Map>> properties = Maps.newHashMap(); - - public BlockColors() { - } - - public static BlockColors create() { - BlockColors blockColors = new BlockColors(); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, state.get(TallPlantBlock.HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos) : -1, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProperty(TallPlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getColor(0.5, 1.0), Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getSpruceColor(), Blocks.SPRUCE_LEAVES); - 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(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 = state.get(StemBlock.AGE); - int j = i * 32; - int k = 255 - i * 8; - int l = i * 4; - return j << 16 | k << 8 | l; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int getParticleColor(BlockState state, World world, BlockPos pos) { - BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock())); - if (blockColorProvider != null) { - return blockColorProvider.getColor(state, null, null, 0); - } else { - MapColor mapColor = state.getMapColor(world, pos); - return mapColor != null ? mapColor.color : -1; - } - } - - public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { - 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 (Block block : blocks) { - this.providers.set(provider, Registry.BLOCK.getRawId(block)); - } - - } - - private void registerColorProperties(Set> properties, Block... blocks) { - int var4 = blocks.length; - - for (Block block : blocks) { - this.properties.put(block, properties); - } - - } - - private void registerColorProperty(Property property, Block... blocks) { - this.registerColorProperties(ImmutableSet.of(property), blocks); - } - - public Set> getProperties(Block block) { - return this.properties.getOrDefault(block, ImmutableSet.of()); - } -} diff --git a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 32c2fb6..3946c1f 100644 --- a/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -6,24 +6,13 @@ import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - return getCurrentlyRunningServerDedicated(); - } - - private static String translateTextFallback(String translationKey) { - return language.get(translationKey); - } - public static String translateText(String translationKey) { - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.19.2/src/main/resources/fabric.mod.json b/1.19.2/src/main/resources/fabric.mod.json index c999d2a..ffac96b 100644 --- a/1.19.2/src/main/resources/fabric.mod.json +++ b/1.19.2/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.4", - "fabric": "*", + "fabricloader": "*", "minecraft": "*" } } diff --git a/1.19.2/src/main/resources/minecraft-data-generator.mixins.json b/1.19.2/src/main/resources/minecraft-data-generator.mixins.json index f3afe06..d46bf65 100644 --- a/1.19.2/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.19.2/src/main/resources/minecraft-data-generator.mixins.json @@ -4,11 +4,9 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "EntityTypeAccessor", "EULAMixin", "MiningToolItemAccessor", - "ReadyMixin", - "TheEndBiomeDataAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.19/build.gradle b/1.19/build.gradle index e85de39..054cda3 100644 --- a/1.19/build.gradle +++ b/1.19/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.19" + + mappings { + intermediary() + yarn(4) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.19/gradle.properties b/1.19/gradle.properties deleted file mode 100644 index b4a4ae2..0000000 --- a/1.19/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.19 -yarn_mappings=1.19+build.1 -loader_version=0.14.6 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.55.2+1.19 diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index 88200df..d80bf03 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -2,35 +2,23 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.TheEndBiomeDataAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; -import net.fabricmc.fabric.api.biome.v1.NetherBiomes; +import net.minecraft.tag.BiomeTags; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.DynamicRegistryManager; -import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; -import java.util.HashSet; -import java.util.Set; - public class BiomesDataGenerator implements IDataGenerator { - private static final Set> END_BIOMES = new HashSet<>(); - - static { - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BIOMES_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BARRENS_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_MIDLANDS_MAP().keySet()); - } - - private static String guessBiomeDimensionFromCategory(Biome biome, String biomeName) { - var key = DynamicRegistryManager.BUILTIN.get().get(Registry.BIOME_KEY).getKey(biome).orElseThrow(); - if (NetherBiomes.canGenerateInNether(key)) { + private static String guessBiomeDimensionFromCategory(RegistryKey biome) { + var biomeRegistry = BuiltinRegistries.BIOME; + if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_NETHER)) { return "nether"; - } else if (END_BIOMES.contains(key) || biomeName.startsWith("end_")) { + } else if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_END)) { return "end"; + } else { + return "overworld"; } - return "overworld"; } private static String guessCategoryBasedOnName(String name, String dimension) { @@ -86,211 +74,22 @@ public class BiomesDataGenerator implements IDataGenerator { } } - private static int getBiomeColorFor(String biomeName) { - switch (biomeName) { - case "the_void" -> { - return 0; - } - case "plains" -> { - return 9286496; - } - case "sunflower_plains" -> { - return 11918216; - } - case "snowy_plains" -> { - return 16777215; - } - case "ice_spikes" -> { - return 11853020; - } - case "desert" -> { - return 16421912; - } - case "swamp" -> { - return 522674; - } - case "forest" -> { - return 353825; - } - case "flower_forest" -> { - return 2985545; - } - case "birch_forest" -> { - return 3175492; - } - case "dark_forest" -> { - return 4215066; - } - case "old_growth_birch_forest" -> { - return 5807212; - } - case "old_growth_pine_taiga" -> { - return 5858897; - } - case "old_growth_spruce_taiga" -> { - return 8490617; - } - case "taiga" -> { - return 747097; - } - case "snowy_taiga" -> { - return 3233098; - } - case "savanna" -> { - return 12431967; - } - case "savanna_plateau" -> { - return 10984804; - } - case "windswept_hills" -> { - return 6316128; - } - case "windswept_gravelly_hills" -> { - return 8947848; - } - case "windswept_forest" -> { - return 2250012; - } - case "windswept_savanna" -> { - return 15063687; - } - case "jungle" -> { - return 5470985; - } - case "sparse_jungle" -> { - return 6458135; - } - case "bamboo_jungle" -> { - return 7769620; - } - case "badlands" -> { - return 14238997; - } - case "eroded_badlands" -> { - return 16739645; - } - case "wooded_badlands" -> { - return 11573093; - } - case "meadow" -> { - return 9217136; - } - case "grove" -> { - return 14675173; - } - case "snowy_slopes" -> { - return 14348785; - } - case "frozen_peaks" -> { - return 15399931; - } - case "jagged_peaks" -> { - return 14937325; - } - case "stony_peaks" -> { - return 13750737; - } - case "river" -> { - return 255; - } - case "frozen_river" -> { - return 10526975; - } - case "beach" -> { - return 16440917; - } - case "snowy_beach" -> { - return 16445632; - } - case "stony_shore" -> { - return 10658436; - } - case "warm_ocean" -> { - return 172; - } - case "lukewarm_ocean" -> { - return 144; - } - case "deep_lukewarm_ocean" -> { - return 64; - } - case "ocean" -> { - return 112; - } - case "deep_ocean" -> { - return 48; - } - case "cold_ocean" -> { - return 2105456; - } - case "deep_cold_ocean" -> { - return 2105400; - } - case "frozen_ocean" -> { - return 7368918; - } - case "deep_frozen_ocean" -> { - return 4210832; - } - case "mushroom_fields" -> { - return 16711935; - } - case "dripstone_caves" -> { - return 12690831; - } - case "lush_caves" -> { - return 14652980; - } - case "nether_wastes" -> { - return 12532539; - } - case "warped_forest" -> { - return 4821115; - } - case "crimson_forest" -> { - return 14485512; - } - case "soul_sand_valley" -> { - return 6174768; - } - case "basalt_deltas" -> { - return 4208182; - } - case "the_end" -> { - return 8421631; - } - case "end_highlands" -> { - return 12828041; - } - case "end_midlands" -> { - return 15464630; - } - case "small_end_islands" -> { - return 42; - } - case "end_barrens" -> { - return 9474162; - } - } - System.out.println("Don't know the color of biome: '" + biomeName + "'"); - return 0; - } - - public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { + public static JsonObject generateBiomeInfo(Biome biome) { JsonObject biomeDesc = new JsonObject(); - Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); - String localizationKey = String.format("biome.%s.%s", registryKey.getNamespace(), registryKey.getPath()); - String name = registryKey.getPath(); - biomeDesc.addProperty("id", registry.getRawId(biome)); + RegistryKey registryKey = BuiltinRegistries.BIOME.getKey(biome).orElseThrow(); + Identifier identifier = registryKey.getValue(); + String localizationKey = String.format("biome.%s.%s", identifier.getNamespace(), identifier.getPath()); + String name = identifier.getPath(); + biomeDesc.addProperty("id", BuiltinRegistries.BIOME.getRawId(biome)); biomeDesc.addProperty("name", name); - String dimension = guessBiomeDimensionFromCategory(biome, name); + String dimension = guessBiomeDimensionFromCategory(registryKey); biomeDesc.addProperty("category", guessCategoryBasedOnName(name, dimension)); biomeDesc.addProperty("temperature", biome.getTemperature()); biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName()); //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source biomeDesc.addProperty("dimension", dimension); biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); - biomeDesc.addProperty("color", getBiomeColorFor(registryKey.getPath())); + biomeDesc.addProperty("color", biome.getSkyColor()); biomeDesc.addProperty("rainfall", biome.getDownfall()); return biomeDesc; @@ -304,11 +103,8 @@ public class BiomesDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray biomesArray = new JsonArray(); - DynamicRegistryManager registryManager = DynamicRegistryManager.BUILTIN.get(); - Registry biomeRegistry = registryManager.get(Registry.BIOME_KEY); - - biomeRegistry.stream() - .map(biome -> generateBiomeInfo(biomeRegistry, biome)) + BuiltinRegistries.BIOME.stream() + .map(BiomesDataGenerator::generateBiomeInfo) .forEach(biomesArray::add); return biomesArray; } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5113965..cb40742 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -192,7 +192,7 @@ public class BlocksDataGenerator implements IDataGenerator { Registry blockRegistry = Registry.BLOCK; List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index ebf2ed5..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,78 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 1c9849e..9b4beb5 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..4444934 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -11,29 +10,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 4eacf20..703aead 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.EntityTypeAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -19,7 +18,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -47,11 +45,8 @@ public class EntitiesDataGenerator implements IDataGenerator { } private static String getCategoryFrom(EntityType entityType) { - if (entityType == EntityType.PLAYER) return "UNKNOWN"; // fail early for player entities - /*public T create(World world) { - return this.factory.create(this, world); - }*/ - Entity entity = ((EntityTypeAccessor) entityType).factory().create(entityType, DGU.getWorld()); + if (entityType == EntityType.PLAYER) return "UNKNOWN"; + Entity entity = entityType.create(DGU.getWorld()); if (entity == null) throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); entity.discard(); diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 4253ae6..1739de2 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -40,7 +39,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -52,13 +51,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -105,14 +104,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = Registry.ITEM; - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -131,7 +130,7 @@ public class MaterialsDataGenerator implements IDataGenerator { TagKey effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index edbc986..585eb21 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -5,13 +5,11 @@ import com.google.gson.JsonObject; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; @@ -25,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index dda76c5..5cd4ad1 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -2,11 +2,11 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mojangannoyances.BlockColors; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.world.FoliageColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; @@ -14,13 +14,9 @@ import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -37,7 +33,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -46,24 +42,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -154,8 +149,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java deleted file mode 100644 index 3e62bf5..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(EntityType.class) -public interface EntityTypeAccessor { - @Accessor("factory") - EntityType.EntityFactory factory(); -} 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 ba3b26b..c904c15 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java deleted file mode 100644 index b50d1a9..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -import net.fabricmc.fabric.impl.biome.WeightedPicker; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - - -@Mixin(TheEndBiomeData.class) -public interface TheEndBiomeDataAccessor { - @Accessor("END_BIOMES_MAP") - static Map, WeightedPicker>> END_BIOMES_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor("END_MIDLANDS_MAP") - static Map, WeightedPicker>> END_MIDLANDS_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor("END_BARRENS_MAP") - static Map, WeightedPicker>> END_BARRENS_MAP() { - throw new IllegalStateException("Should never be called."); - } -} diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java deleted file mode 100644 index bb9ae83..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.level.ColorResolver; - -@Environment(EnvType.CLIENT) -public class BiomeColors { - public static final ColorResolver GRASS_COLOR = Biome::getGrassColorAt; - public static final ColorResolver FOLIAGE_COLOR = (biome, x, z) -> biome.getFoliageColor(); - public static final ColorResolver WATER_COLOR = (biome, x, z) -> biome.getWaterColor(); - - public BiomeColors() { - } - - private static int getColor(BlockRenderView world, BlockPos pos, ColorResolver resolver) { - return world.getColor(pos, resolver); - } - - public static int getGrassColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, WATER_COLOR); - } -} - diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java deleted file mode 100644 index ac5dc57..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorProvider { - int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex); -} - 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 deleted file mode 100644 index e8430eb..0000000 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java +++ /dev/null @@ -1,93 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import net.minecraft.block.*; -import net.minecraft.block.enums.DoubleBlockHalf; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.client.color.world.GrassColors; -import net.minecraft.state.property.Property; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.Map; -import java.util.Set; - -public class BlockColors { - private static final int NO_COLOR = -1; - private final IdList providers = new IdList<>(32); - private final Map>> properties = Maps.newHashMap(); - - public BlockColors() { - } - - public static BlockColors create() { - BlockColors blockColors = new BlockColors(); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, state.get(TallPlantBlock.HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos) : -1, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProperty(TallPlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getColor(0.5, 1.0), Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getSpruceColor(), Blocks.SPRUCE_LEAVES); - 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(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 = state.get(StemBlock.AGE); - int j = i * 32; - int k = 255 - i * 8; - int l = i * 4; - return j << 16 | k << 8 | l; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int getParticleColor(BlockState state, World world, BlockPos pos) { - BlockColorProvider blockColorProvider = this.providers.get(Registry.BLOCK.getRawId(state.getBlock())); - if (blockColorProvider != null) { - return blockColorProvider.getColor(state, null, null, 0); - } else { - MapColor mapColor = state.getMapColor(world, pos); - return mapColor != null ? mapColor.color : -1; - } - } - - public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { - 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 (Block block : blocks) { - this.providers.set(provider, Registry.BLOCK.getRawId(block)); - } - - } - - private void registerColorProperties(Set> properties, Block... blocks) { - int var4 = blocks.length; - - for (Block block : blocks) { - this.properties.put(block, properties); - } - - } - - private void registerColorProperty(Property property, Block... blocks) { - this.registerColorProperties(ImmutableSet.of(property), blocks); - } - - public Set> getProperties(Block block) { - return this.properties.getOrDefault(block, ImmutableSet.of()); - } -} diff --git a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 32c2fb6..3946c1f 100644 --- a/1.19/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.19/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -6,24 +6,13 @@ import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - return getCurrentlyRunningServerDedicated(); - } - - private static String translateTextFallback(String translationKey) { - return language.get(translationKey); - } - public static String translateText(String translationKey) { - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.19/src/main/resources/fabric.mod.json b/1.19/src/main/resources/fabric.mod.json index 1d6fbb5..74a506b 100644 --- a/1.19/src/main/resources/fabric.mod.json +++ b/1.19/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.4", - "fabric": "*", + "fabricloader": "*", "minecraft": "1.19" } } diff --git a/1.19/src/main/resources/minecraft-data-generator.mixins.json b/1.19/src/main/resources/minecraft-data-generator.mixins.json index f3afe06..d46bf65 100644 --- a/1.19/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.19/src/main/resources/minecraft-data-generator.mixins.json @@ -4,11 +4,9 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "EntityTypeAccessor", "EULAMixin", "MiningToolItemAccessor", - "ReadyMixin", - "TheEndBiomeDataAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.20.4/build.gradle b/1.20.4/build.gradle index e85de39..aecbdee 100644 --- a/1.20.4/build.gradle +++ b/1.20.4/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.20.4" + + mappings { + intermediary() + yarn(3) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties deleted file mode 100644 index 7d228ec..0000000 --- a/1.20.4/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.3 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.92.0+1.20.4 diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index bda5f96..a1b3b73 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -2,36 +2,24 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.TheEndBiomeDataAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; -import net.fabricmc.fabric.api.biome.v1.NetherBiomes; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.BiomeTags; import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; -import java.util.HashSet; -import java.util.Set; - public class BiomesDataGenerator implements IDataGenerator { - private static final Set> END_BIOMES = new HashSet<>(); - - static { - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BIOMES_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BARRENS_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_MIDLANDS_MAP().keySet()); - } - - private static String guessBiomeDimensionFromCategory(Biome biome, String biomeName) { - var key = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME).getKey(biome).orElseThrow(); - if (NetherBiomes.canGenerateInNether(key)) { + private static String guessBiomeDimensionFromCategory(Biome biome) { + var biomeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME); + if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_NETHER)) { return "nether"; - } else if (END_BIOMES.contains(key) || biomeName.startsWith("end_")) { + } else if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_END)) { return "end"; + } else { + return "overworld"; } - return "overworld"; } private static String guessCategoryBasedOnName(String name, String dimension) { @@ -87,196 +75,6 @@ public class BiomesDataGenerator implements IDataGenerator { } } - private static int getBiomeColorFor(String biomeName) { - switch (biomeName) { - case "the_void" -> { - return 0; - } - case "plains" -> { - return 9286496; - } - case "sunflower_plains" -> { - return 11918216; - } - case "snowy_plains" -> { - return 16777215; - } - case "ice_spikes" -> { - return 11853020; - } - case "desert" -> { - return 16421912; - } - case "swamp" -> { - return 522674; - } - case "forest" -> { - return 353825; - } - case "flower_forest" -> { - return 2985545; - } - case "birch_forest" -> { - return 3175492; - } - case "dark_forest" -> { - return 4215066; - } - case "old_growth_birch_forest" -> { - return 5807212; - } - case "old_growth_pine_taiga" -> { - return 5858897; - } - case "old_growth_spruce_taiga" -> { - return 8490617; - } - case "taiga" -> { - return 747097; - } - case "snowy_taiga" -> { - return 3233098; - } - case "savanna" -> { - return 12431967; - } - case "savanna_plateau" -> { - return 10984804; - } - case "windswept_hills" -> { - return 6316128; - } - case "windswept_gravelly_hills" -> { - return 8947848; - } - case "windswept_forest" -> { - return 2250012; - } - case "windswept_savanna" -> { - return 15063687; - } - case "jungle" -> { - return 5470985; - } - case "sparse_jungle" -> { - return 6458135; - } - case "bamboo_jungle" -> { - return 7769620; - } - case "badlands" -> { - return 14238997; - } - case "eroded_badlands" -> { - return 16739645; - } - case "wooded_badlands" -> { - return 11573093; - } - case "meadow" -> { - return 9217136; - } - case "grove" -> { - return 14675173; - } - case "snowy_slopes" -> { - return 14348785; - } - case "frozen_peaks" -> { - return 15399931; - } - case "jagged_peaks" -> { - return 14937325; - } - case "stony_peaks" -> { - return 13750737; - } - case "river" -> { - return 255; - } - case "frozen_river" -> { - return 10526975; - } - case "beach" -> { - return 16440917; - } - case "snowy_beach" -> { - return 16445632; - } - case "stony_shore" -> { - return 10658436; - } - case "warm_ocean" -> { - return 172; - } - case "lukewarm_ocean" -> { - return 144; - } - case "deep_lukewarm_ocean" -> { - return 64; - } - case "ocean" -> { - return 112; - } - case "deep_ocean" -> { - return 48; - } - case "cold_ocean" -> { - return 2105456; - } - case "deep_cold_ocean" -> { - return 2105400; - } - case "frozen_ocean" -> { - return 7368918; - } - case "deep_frozen_ocean" -> { - return 4210832; - } - case "mushroom_fields" -> { - return 16711935; - } - case "dripstone_caves" -> { - return 12690831; - } - case "lush_caves" -> { - return 14652980; - } - case "nether_wastes" -> { - return 12532539; - } - case "warped_forest" -> { - return 4821115; - } - case "crimson_forest" -> { - return 14485512; - } - case "soul_sand_valley" -> { - return 6174768; - } - case "basalt_deltas" -> { - return 4208182; - } - case "the_end" -> { - return 8421631; - } - case "end_highlands" -> { - return 12828041; - } - case "end_midlands" -> { - return 15464630; - } - case "small_end_islands" -> { - return 42; - } - case "end_barrens" -> { - return 9474162; - } - } - System.out.println("Don't know the color of biome: '" + biomeName + "'"); - return 0; - } - public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { JsonObject biomeDesc = new JsonObject(); Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); @@ -284,7 +82,7 @@ public class BiomesDataGenerator implements IDataGenerator { String name = registryKey.getPath(); biomeDesc.addProperty("id", registry.getRawId(biome)); biomeDesc.addProperty("name", name); - String dimension = guessBiomeDimensionFromCategory(biome, name); + String dimension = guessBiomeDimensionFromCategory(biome); biomeDesc.addProperty("category", guessCategoryBasedOnName(name, dimension)); biomeDesc.addProperty("temperature", biome.getTemperature()); //biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName());// - removed in 1.19.4 @@ -292,7 +90,7 @@ public class BiomesDataGenerator implements IDataGenerator { //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source biomeDesc.addProperty("dimension", dimension); biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); - biomeDesc.addProperty("color", getBiomeColorFor(registryKey.getPath())); + biomeDesc.addProperty("color", biome.getSkyColor()); //biomeDesc.addProperty("rainfall", biome.getDownfall());// - removed in 1.19.4 return biomeDesc; diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 8b9d0e0..68a169c 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -14,10 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -42,8 +39,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -72,7 +69,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 44e8e29..324b4d9 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKeys; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registries.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registries.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -189,10 +189,9 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK); List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + Registries.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index c47684a..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,77 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 3c619c3..dd6dc01 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -14,7 +14,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java index 6bd50d7..38d68ac 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -12,29 +11,11 @@ import net.minecraft.util.Identifier; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 50e3516..71c5ca7 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,12 +2,10 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.EntityTypeAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SpawnReason; import net.minecraft.entity.mob.AmbientEntity; import net.minecraft.entity.mob.HostileEntity; import net.minecraft.entity.mob.MobEntity; @@ -17,12 +15,10 @@ import net.minecraft.entity.passive.PassiveEntity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -40,10 +36,10 @@ public class EntitiesDataGenerator implements IDataGenerator { MinecraftServer minecraftServer = DGU.getCurrentlyRunningServer(); if (minecraftServer != null) { - Entity entityObject = ((EntityTypeAccessor) entityType).factory().create(entityType, minecraftServer.getOverworld()); + Entity entityObject = entityType.create(minecraftServer.getOverworld()); entityTypeString = entityObject != null ? getEntityTypeForClass(entityObject.getClass()) : "unknown"; } - if(entityType == EntityType.PLAYER){ + if (entityType == EntityType.PLAYER) { entityTypeString = "player"; } @@ -54,11 +50,8 @@ public class EntitiesDataGenerator implements IDataGenerator { } private static String getCategoryFrom(EntityType entityType) { - if (entityType == EntityType.PLAYER) return "UNKNOWN"; // fail early for player entities - /*public T create(World world) { - return this.factory.create(this, world); - }*/ - Entity entity = ((EntityTypeAccessor) entityType).factory().create(entityType, DGU.getWorld()); + if (entityType == EntityType.PLAYER) return "UNKNOWN"; + Entity entity = entityType.create(DGU.getWorld()); if (entity == null) throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); entity.discard(); diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index a5b164f..97a7363 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -12,7 +12,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 9a5fac1..674dd22 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -41,7 +40,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -53,13 +52,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -108,14 +107,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -134,7 +133,7 @@ public class MaterialsDataGenerator implements IDataGenerator { TagKey effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index e446a50..bc5a9ac 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 1f4f96b..5c21246 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -2,12 +2,12 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mojangannoyances.BlockColors; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.world.FoliageColors; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; @@ -16,13 +16,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -39,7 +35,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -48,24 +44,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -156,8 +151,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java deleted file mode 100644 index 3e62bf5..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(EntityType.class) -public interface EntityTypeAccessor { - @Accessor("factory") - EntityType.EntityFactory factory(); -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java index 9cec9cd..cf8d9ff 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,19 +9,14 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java deleted file mode 100644 index dc35e0b..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -import net.fabricmc.fabric.impl.biome.WeightedPicker; -import net.minecraft.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - - -@Mixin(TheEndBiomeData.class) -public interface TheEndBiomeDataAccessor { - @Accessor(value = "END_BIOMES_MAP", remap = false) - static Map, WeightedPicker>> END_BIOMES_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_MIDLANDS_MAP", remap = false) - static Map, WeightedPicker>> END_MIDLANDS_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_BARRENS_MAP", remap = false) - static Map, WeightedPicker>> END_BARRENS_MAP() { - throw new IllegalStateException("Should never be called."); - } -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java deleted file mode 100644 index d374b11..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.ColorResolver; - -@Environment(EnvType.CLIENT) -public class BiomeColors { - public static final ColorResolver GRASS_COLOR = Biome::getGrassColorAt; - public static final ColorResolver FOLIAGE_COLOR = (biome, x, z) -> biome.getFoliageColor(); - public static final ColorResolver WATER_COLOR = (biome, x, z) -> biome.getWaterColor(); - - public BiomeColors() { - } - - private static int getColor(BlockRenderView world, BlockPos pos, ColorResolver resolver) { - return world.getColor(pos, resolver); - } - - public static int getGrassColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, WATER_COLOR); - } -} - diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java deleted file mode 100644 index ac5dc57..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorProvider { - int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex); -} - diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java deleted file mode 100644 index e48e98a..0000000 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java +++ /dev/null @@ -1,94 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import dev.u9g.minecraftdatagenerator.util.DGU; -import net.minecraft.block.*; -import net.minecraft.block.enums.DoubleBlockHalf; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.client.color.world.GrassColors; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.state.property.Property; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.Map; -import java.util.Set; - -public class BlockColors { - private static final int NO_COLOR = -1; - private final IdList providers = new IdList<>(32); - private final Map>> properties = Maps.newHashMap(); - - public BlockColors() { - } - - public static BlockColors create() { - BlockColors blockColors = new BlockColors(); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, state.get(TallPlantBlock.HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos) : -1, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProperty(TallPlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getColor(0.5, 1.0), Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.SHORT_GRASS, Blocks.POTTED_FERN); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getSpruceColor(), Blocks.SPRUCE_LEAVES); - 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(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 = state.get(StemBlock.AGE); - int j = i * 32; - int k = 255 - i * 8; - int l = i * 4; - return j << 16 | k << 8 | l; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int getParticleColor(BlockState state, World world, BlockPos pos) { - BlockColorProvider blockColorProvider = this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock())); - if (blockColorProvider != null) { - return blockColorProvider.getColor(state, null, null, 0); - } else { - MapColor mapColor = state.getMapColor(world, pos); - return mapColor != null ? mapColor.color : -1; - } - } - - public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { - 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 (Block block : blocks) { - this.providers.set(provider, DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(block)); - } - - } - - private void registerColorProperties(Set> properties, Block... blocks) { - int var4 = blocks.length; - - for (Block block : blocks) { - this.properties.put(block, properties); - } - - } - - private void registerColorProperty(Property property, Block... blocks) { - this.registerColorProperties(ImmutableSet.of(property), blocks); - } - - public Set> getProperties(Block block) { - return this.properties.getOrDefault(block, ImmutableSet.of()); - } -} diff --git a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 32c2fb6..3946c1f 100644 --- a/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.20.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -6,24 +6,13 @@ import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - return getCurrentlyRunningServerDedicated(); - } - - private static String translateTextFallback(String translationKey) { - return language.get(translationKey); - } - public static String translateText(String translationKey) { - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.20.4/src/main/resources/fabric.mod.json b/1.20.4/src/main/resources/fabric.mod.json index c999d2a..ffac96b 100644 --- a/1.20.4/src/main/resources/fabric.mod.json +++ b/1.20.4/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.4", - "fabric": "*", + "fabricloader": "*", "minecraft": "*" } } diff --git a/1.20.4/src/main/resources/minecraft-data-generator.mixins.json b/1.20.4/src/main/resources/minecraft-data-generator.mixins.json index f3afe06..d46bf65 100644 --- a/1.20.4/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.20.4/src/main/resources/minecraft-data-generator.mixins.json @@ -4,11 +4,9 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "EntityTypeAccessor", "EULAMixin", "MiningToolItemAccessor", - "ReadyMixin", - "TheEndBiomeDataAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.20.5/build.gradle b/1.20.5/build.gradle new file mode 100644 index 0000000..b062e21 --- /dev/null +++ b/1.20.5/build.gradle @@ -0,0 +1,47 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + +plugins { + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.20.5" + + mappings { + intermediary() + yarn(1) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true +} + +dependencies { + implementation project(":common") +} + +processResources { + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java new file mode 100644 index 0000000..a1b3b73 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -0,0 +1,115 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.BiomeTags; +import net.minecraft.util.Identifier; +import net.minecraft.world.biome.Biome; + +public class BiomesDataGenerator implements IDataGenerator { + private static String guessBiomeDimensionFromCategory(Biome biome) { + var biomeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME); + if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_NETHER)) { + return "nether"; + } else if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_END)) { + return "end"; + } else { + return "overworld"; + } + } + + private static String guessCategoryBasedOnName(String name, String dimension) { + if (dimension.equals("nether")) { + return "nether"; + } else if (dimension.equals("end")) { + return "the_end"; + } + + if (name.contains("end")) { + System.out.println(); + } + + if (name.contains("hills")) { + return "extreme_hills"; + } else if (name.contains("ocean")) { + return "ocean"; + } else if (name.contains("plains")) { + return "plains"; + } else if (name.contains("ice") || name.contains("frozen")) { + return "ice"; + } else if (name.contains("jungle")) { + return "jungle"; + } else if (name.contains("desert")) { + return "desert"; + } else if (name.contains("forest") || name.contains("grove")) { + return "forest"; + } else if (name.contains("taiga")) { + return "taiga"; + } else if (name.contains("swamp")) { + return "swamp"; + } else if (name.contains("river")) { + return "river"; + } else if (name.equals("the_end")) { + return "the_end"; + } else if (name.contains("mushroom")) { + return "mushroom"; + } else if (name.contains("beach") || name.equals("stony_shore")) { + return "beach"; + } else if (name.contains("savanna")) { + return "savanna"; + } else if (name.contains("badlands")) { + return "mesa"; + } else if (name.contains("peaks") || name.equals("snowy_slopes") || name.equals("meadow")) { + return "mountain"; + } else if (name.equals("the_void")) { + return "none"; + } else if (name.contains("cave") || name.equals("deep_dark")) { + return "underground"; + } else { + System.out.println("Unable to find biome category for biome with name: '" + name + "'"); + return "none"; + } + } + + public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { + JsonObject biomeDesc = new JsonObject(); + Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); + String localizationKey = String.format("biome.%s.%s", registryKey.getNamespace(), registryKey.getPath()); + String name = registryKey.getPath(); + biomeDesc.addProperty("id", registry.getRawId(biome)); + biomeDesc.addProperty("name", name); + String dimension = guessBiomeDimensionFromCategory(biome); + biomeDesc.addProperty("category", guessCategoryBasedOnName(name, dimension)); + biomeDesc.addProperty("temperature", biome.getTemperature()); + //biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName());// - removed in 1.19.4 + biomeDesc.addProperty("has_precipitation", biome.hasPrecipitation()); + //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source + biomeDesc.addProperty("dimension", dimension); + biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); + biomeDesc.addProperty("color", biome.getSkyColor()); + //biomeDesc.addProperty("rainfall", biome.getDownfall());// - removed in 1.19.4 + + return biomeDesc; + } + + @Override + public String getDataName() { + return "biomes"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray biomesArray = new JsonArray(); + DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager(); + Registry biomeRegistry = registryManager.get(RegistryKeys.BIOME); + + biomeRegistry.stream() + .map(biome -> generateBiomeInfo(biomeRegistry, biome)) + .forEach(biomesArray::add); + return biomesArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java new file mode 100644 index 0000000..68a169c --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -0,0 +1,110 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.EmptyBlockView; + +import java.util.*; + +public class BlockCollisionShapesDataGenerator implements IDataGenerator { + + @Override + public String getDataName() { + return "blockCollisionShapes"; + } + + @Override + public JsonObject generateDataJson() { + Registry blockRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK); + BlockShapesCache blockShapesCache = new BlockShapesCache(); + + blockRegistry.forEach(blockShapesCache::processBlock); + + JsonObject resultObject = new JsonObject(); + + resultObject.add("blocks", blockShapesCache.dumpBlockShapeIndices(blockRegistry)); + resultObject.add("shapes", blockShapesCache.dumpShapesObject()); + + return resultObject; + } + + private static class BlockShapesCache { + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); + private int lastCollisionShapeId = 0; + + public void processBlock(Block block) { + List blockStates = block.getStateManager().getStates(); + List blockCollisionShapes = new ArrayList<>(); + + for (BlockState blockState : blockStates) { + VoxelShape blockShape = blockState.getCollisionShape(EmptyBlockView.INSTANCE, BlockPos.ORIGIN); + Integer blockShapeIndex = uniqueBlockShapes.get(blockShape); + + if (blockShapeIndex == null) { + blockShapeIndex = lastCollisionShapeId++; + uniqueBlockShapes.put(blockShape, blockShapeIndex); + } + blockCollisionShapes.add(blockShapeIndex); + } + + this.blockCollisionShapes.put(block, blockCollisionShapes); + } + + public JsonObject dumpBlockShapeIndices(Registry blockRegistry) { + JsonObject resultObject = new JsonObject(); + + for (var entry : blockCollisionShapes.entrySet()) { + List blockCollisions = entry.getValue(); + long distinctShapesCount = blockCollisions.stream().distinct().count(); + JsonElement blockCollision; + if (distinctShapesCount == 1L) { + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); + } else { + blockCollision = new JsonArray(); + for (int collisionId : blockCollisions) { + ((JsonArray) blockCollision).add(collisionId); + } + } + + Identifier registryKey = blockRegistry.getKey(entry.getKey()).orElseThrow().getValue(); + resultObject.add(registryKey.getPath(), blockCollision); + } + + return resultObject; + } + + public JsonObject dumpShapesObject() { + JsonObject shapesObject = new JsonObject(); + + for (var entry : uniqueBlockShapes.entrySet()) { + JsonArray boxesArray = new JsonArray(); + entry.getKey().forEachBox((x1, y1, z1, x2, y2, z2) -> { + JsonArray oneBoxJsonArray = new JsonArray(); + + oneBoxJsonArray.add(x1); + oneBoxJsonArray.add(y1); + oneBoxJsonArray.add(z1); + + oneBoxJsonArray.add(x2); + oneBoxJsonArray.add(y2); + oneBoxJsonArray.add(z2); + + boxesArray.add(oneBoxJsonArray); + }); + shapesObject.add(Integer.toString(entry.getValue()), boxesArray); + } + return shapesObject; + } + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java new file mode 100644 index 0000000..324b4d9 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -0,0 +1,197 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.common.base.CaseFormat; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.block.AirBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.loot.context.LootContextParameterSet; +import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.IntProperty; +import net.minecraft.state.property.Property; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.EmptyBlockView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; + +public class BlocksDataGenerator implements IDataGenerator { + + private static final Logger logger = LoggerFactory.getLogger(BlocksDataGenerator.class); + + private static List getItemsEffectiveForBlock(BlockState blockState) { + return DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM).stream() + .filter(item -> item.getDefaultStack().isSuitableFor(blockState)) + .collect(Collectors.toList()); + } + + private static void populateDropsIfPossible(BlockState blockState, Item firstToolItem, List outDrops) { + MinecraftServer minecraftServer = DGU.getCurrentlyRunningServer(); + if (minecraftServer != null) { + //If we have local world context, we can actually evaluate loot tables and determine actual data + ServerWorld serverWorld = minecraftServer.getOverworld(); + LootContextParameterSet.Builder lootContextParameterSet = new LootContextParameterSet.Builder(serverWorld) + .add(LootContextParameters.BLOCK_STATE, blockState) + .add(LootContextParameters.ORIGIN, Vec3d.ZERO) + .add(LootContextParameters.TOOL, firstToolItem.getDefaultStack()); + outDrops.addAll(blockState.getDroppedStacks(lootContextParameterSet)); + } else { + //If we're lacking world context to correctly determine drops, assume that default drop is ItemBlock stack in quantity of 1 + Item itemBlock = blockState.getBlock().asItem(); + if (itemBlock != Items.AIR) { + outDrops.add(itemBlock.getDefaultStack()); + } + } + } + + private static String getPropertyTypeName(Property property) { + //Explicitly handle default minecraft properties + if (property instanceof BooleanProperty) { + return "bool"; + } + if (property instanceof IntProperty) { + return "int"; + } + if (property instanceof EnumProperty) { + return "enum"; + } + + //Use simple class name as fallback, this code will give something like + //example_type for ExampleTypeProperty class name + String rawPropertyName = property.getClass().getSimpleName().replace("Property", ""); + return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, rawPropertyName); + } + + private static > JsonObject generateStateProperty(Property property) { + JsonObject propertyObject = new JsonObject(); + Collection propertyValues = property.getValues(); + + propertyObject.addProperty("name", property.getName()); + propertyObject.addProperty("type", getPropertyTypeName(property)); + propertyObject.addProperty("num_values", propertyValues.size()); + + //Do not add values for vanilla boolean properties, they are known by default + if (!(property instanceof BooleanProperty)) { + JsonArray propertyValuesArray = new JsonArray(); + for (T propertyValue : propertyValues) { + propertyValuesArray.add(property.name(propertyValue)); + } + propertyObject.add("values", propertyValuesArray); + } + return propertyObject; + } + + private static String findMatchingBlockMaterial(BlockState blockState, List materials) { + List matchingMaterials = materials.stream() + .filter(material -> material.getPredicate().test(blockState)) + .collect(Collectors.toList()); + + if (matchingMaterials.size() > 1) { + var firstMaterial = matchingMaterials.getFirst(); + var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); + + if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { + logger.error("Block {} matches multiple materials: {}", blockState.getBlock(), matchingMaterials); + } + } + if (matchingMaterials.isEmpty()) { + return "default"; + } + return matchingMaterials.getFirst().getMaterialName(); + } + + public static JsonObject generateBlock(List materials, Block block) { + JsonObject blockDesc = new JsonObject(); + + List blockStates = block.getStateManager().getStates(); + BlockState defaultState = block.getDefaultState(); + Identifier registryKey = Registries.BLOCK.getKey(block).orElseThrow().getValue(); + String localizationKey = block.getTranslationKey(); + List effectiveTools = getItemsEffectiveForBlock(defaultState); + + blockDesc.addProperty("id", Registries.BLOCK.getRawId(block)); + blockDesc.addProperty("name", registryKey.getPath()); + blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); + + blockDesc.addProperty("hardness", block.getHardness()); + blockDesc.addProperty("resistance", block.getBlastResistance()); + blockDesc.addProperty("stackSize", block.asItem().getMaxCount()); + blockDesc.addProperty("diggable", block.getHardness() != -1.0f && !(block instanceof AirBlock)); +// JsonObject effTools = new JsonObject(); +// effectiveTools.forEach(item -> effTools.addProperty( +// String.valueOf(Registry.ITEM.getRawId(item)), // key +// item.getMiningSpeedMultiplier(item.getDefaultStack(), defaultState) // value +// )); +// blockDesc.add("effectiveTools", effTools); + blockDesc.addProperty("material", findMatchingBlockMaterial(defaultState, materials)); + + blockDesc.addProperty("transparent", !defaultState.isOpaque()); + blockDesc.addProperty("emitLight", defaultState.getLuminance()); + blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); + + blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); + + JsonArray stateProperties = new JsonArray(); + for (Property property : block.getStateManager().getProperties()) { + stateProperties.add(generateStateProperty(property)); + } + blockDesc.add("states", stateProperties); + + //Only add harvest tools if tool is required for harvesting this block + if (defaultState.isToolRequired()) { + JsonObject effectiveToolsObject = new JsonObject(); + for (Item effectiveItem : effectiveTools) { + effectiveToolsObject.addProperty(Integer.toString(Item.getRawId(effectiveItem)), true); + } + blockDesc.add("harvestTools", effectiveToolsObject); + } + + List actualBlockDrops = new ArrayList<>(); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); + + JsonArray dropsArray = new JsonArray(); + for (ItemStack dropStack : actualBlockDrops) { + dropsArray.add(Item.getRawId(dropStack.getItem())); + } + blockDesc.add("drops", dropsArray); + + VoxelShape blockCollisionShape = defaultState.getCollisionShape(EmptyBlockView.INSTANCE, BlockPos.ORIGIN); + blockDesc.addProperty("boundingBox", blockCollisionShape.isEmpty() ? "empty" : "block"); + + return blockDesc; + } + + @Override + public String getDataName() { + return "blocks"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultBlocksArray = new JsonArray(); + List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); + + Registries.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); + return resultBlocksArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java new file mode 100644 index 0000000..dd6dc01 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -0,0 +1,46 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.stream.Collectors; + +public class EffectsDataGenerator implements IDataGenerator { + public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { + JsonObject effectDesc = new JsonObject(); + Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); + + effectDesc.addProperty("id", registry.getRawId(statusEffect)); + if (statusEffect == StatusEffects.UNLUCK) { + effectDesc.addProperty("name", "BadLuck"); + effectDesc.addProperty("displayName", "Bad Luck"); + } else { + effectDesc.addProperty("name", Arrays.stream(registryKey.getPath().split("_")).map(StringUtils::capitalize).collect(Collectors.joining())); + effectDesc.addProperty("displayName", DGU.translateText(statusEffect.getTranslationKey())); + } + + effectDesc.addProperty("type", statusEffect.isBeneficial() ? "good" : "bad"); + return effectDesc; + } + + @Override + public String getDataName() { + return "effects"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultsArray = new JsonArray(); + Registry statusEffectRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.STATUS_EFFECT); + statusEffectRegistry.forEach(effect -> resultsArray.add(generateEffect(statusEffectRegistry, effect))); + return resultsArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java new file mode 100644 index 0000000..5d2ebb9 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -0,0 +1,89 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.Item; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.List; + +public class EnchantmentsDataGenerator implements IDataGenerator { + public static String getEnchantmentTargetName(TagKey target) { + return target.id().getPath().split("/")[1]; + } + + //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level + private static JsonObject generateEnchantmentMinPowerCoefficients(Enchantment enchantment) { + int b = enchantment.getMinPower(0); + int a = enchantment.getMinPower(1) - b; + + JsonObject resultObject = new JsonObject(); + resultObject.addProperty("a", a); + resultObject.addProperty("b", b); + return resultObject; + } + + private static JsonObject generateEnchantmentMaxPowerCoefficients(Enchantment enchantment) { + int b = enchantment.getMaxPower(0); + int a = enchantment.getMaxPower(1) - b; + + JsonObject resultObject = new JsonObject(); + resultObject.addProperty("a", a); + resultObject.addProperty("b", b); + return resultObject; + } + + public static JsonObject generateEnchantment(Registry registry, Enchantment enchantment) { + JsonObject enchantmentDesc = new JsonObject(); + Identifier registryKey = registry.getKey(enchantment).orElseThrow().getValue(); + + enchantmentDesc.addProperty("id", registry.getRawId(enchantment)); + enchantmentDesc.addProperty("name", registryKey.getPath()); + enchantmentDesc.addProperty("displayName", DGU.translateText(enchantment.getTranslationKey())); + + enchantmentDesc.addProperty("maxLevel", enchantment.getMaxLevel()); + enchantmentDesc.add("minCost", generateEnchantmentMinPowerCoefficients(enchantment)); + enchantmentDesc.add("maxCost", generateEnchantmentMaxPowerCoefficients(enchantment)); + + enchantmentDesc.addProperty("treasureOnly", enchantment.isTreasure()); + enchantmentDesc.addProperty("curse", enchantment.isCursed()); + + List incompatibleEnchantments = registry.stream() + .filter(other -> !enchantment.canCombine(other)) + .filter(other -> other != enchantment) + .toList(); + + JsonArray excludes = new JsonArray(); + for (Enchantment excludedEnchantment : incompatibleEnchantments) { + Identifier otherKey = registry.getKey(excludedEnchantment).orElseThrow().getValue(); + excludes.add(otherKey.getPath()); + } + enchantmentDesc.add("exclude", excludes); + + enchantmentDesc.addProperty("category", getEnchantmentTargetName(enchantment.getApplicableItems())); + enchantmentDesc.addProperty("weight", enchantment.getWeight()); + enchantmentDesc.addProperty("tradeable", enchantment.isAvailableForEnchantedBookOffer()); + enchantmentDesc.addProperty("discoverable", enchantment.isAvailableForRandomSelection()); + + return enchantmentDesc; + } + + @Override + public String getDataName() { + return "enchantments"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultsArray = new JsonArray(); + Registry enchantmentRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ENCHANTMENT); + enchantmentRegistry.stream() + .forEach(enchantment -> resultsArray.add(generateEnchantment(enchantmentRegistry, enchantment))); + return resultsArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java new file mode 100644 index 0000000..70a8804 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -0,0 +1,119 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.mob.AmbientEntity; +import net.minecraft.entity.mob.HostileEntity; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.entity.mob.WaterCreatureEntity; +import net.minecraft.entity.passive.AnimalEntity; +import net.minecraft.entity.passive.PassiveEntity; +import net.minecraft.entity.projectile.ProjectileEntity; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.Identifier; + +public class EntitiesDataGenerator implements IDataGenerator { + public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { + JsonObject entityDesc = new JsonObject(); + Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); + int entityRawId = entityRegistry.getRawId(entityType); + + entityDesc.addProperty("id", entityRawId); + entityDesc.addProperty("internalId", entityRawId); + entityDesc.addProperty("name", registryKey.getPath()); + + entityDesc.addProperty("displayName", DGU.translateText(entityType.getTranslationKey())); + entityDesc.addProperty("width", entityType.getDimensions().width()); + entityDesc.addProperty("height", entityType.getDimensions().height()); + + String entityTypeString = "UNKNOWN"; + MinecraftServer minecraftServer = DGU.getCurrentlyRunningServer(); + + if (minecraftServer != null) { + Entity entityObject = entityType.create(minecraftServer.getOverworld()); + entityTypeString = entityObject != null ? getEntityTypeForClass(entityObject.getClass()) : "unknown"; + } + if (entityType == EntityType.PLAYER) { + entityTypeString = "player"; + } + + entityDesc.addProperty("type", entityTypeString); + entityDesc.addProperty("category", getCategoryFrom(entityType)); + + return entityDesc; + } + + private static String getCategoryFrom(EntityType entityType) { + if (entityType == EntityType.PLAYER) return "UNKNOWN"; + Entity entity = entityType.create(DGU.getWorld()); + if (entity == null) + throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); + entity.discard(); + return switch (entity.getClass().getPackageName()) { + 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"; + case "net.minecraft.entity.projectile", "net.minecraft.entity.projectile.thrown" -> "Projectiles"; + case "net.minecraft.entity.passive" -> "Passive mobs"; + case "net.minecraft.entity.vehicle" -> "Vehicles"; + case "net.minecraft.entity" -> "UNKNOWN"; + default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName()); + }; + } + + //Honestly, both "type" and "category" fields in the schema and examples do not contain any useful information + //Since category is optional, I will just leave it out, and for type I will assume general entity classification + //by the Entity class hierarchy (which has some weirdness too by the way) + private static String getEntityTypeForClass(Class entityClass) { + //Top-level classifications + if (WaterCreatureEntity.class.isAssignableFrom(entityClass)) { + return "water_creature"; + } + if (AnimalEntity.class.isAssignableFrom(entityClass)) { + return "animal"; + } + if (HostileEntity.class.isAssignableFrom(entityClass)) { + return "hostile"; + } + if (AmbientEntity.class.isAssignableFrom(entityClass)) { + return "ambient"; + } + + //Second level classifications. PathAwareEntity is not included because it + //doesn't really make much sense to categorize by it + if (PassiveEntity.class.isAssignableFrom(entityClass)) { + return "passive"; + } + if (MobEntity.class.isAssignableFrom(entityClass)) { + return "mob"; + } + + //Other classifications only include living entities and projectiles. everything else is categorized as other + if (LivingEntity.class.isAssignableFrom(entityClass)) { + return "living"; + } + if (ProjectileEntity.class.isAssignableFrom(entityClass)) { + return "projectile"; + } + return "other"; + } + + @Override + public String getDataName() { + return "entities"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultArray = new JsonArray(); + Registry> entityTypeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ENTITY_TYPE); + entityTypeRegistry.forEach(entity -> resultArray.add(generateEntity(entityTypeRegistry, entity))); + return resultArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java new file mode 100644 index 0000000..ddb61fe --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -0,0 +1,52 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +import java.util.Objects; + +public class FoodsDataGenerator implements IDataGenerator { + public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { + JsonObject foodDesc = new JsonObject(); + Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); + + foodDesc.addProperty("id", registry.getRawId(foodItem)); + foodDesc.addProperty("name", registryKey.getPath()); + + foodDesc.addProperty("stackSize", foodItem.getMaxCount()); + foodDesc.addProperty("displayName", DGU.translateText(foodItem.getTranslationKey())); + + FoodComponent foodComponent = Objects.requireNonNull(foodItem.getComponents().get(DataComponentTypes.FOOD)); + float foodPoints = foodComponent.nutrition(); + float saturationRatio = foodComponent.saturation() * 2.0F; + float saturation = foodPoints * saturationRatio; + + foodDesc.addProperty("foodPoints", foodPoints); + foodDesc.addProperty("saturation", saturation); + + foodDesc.addProperty("effectiveQuality", foodPoints + saturation); + foodDesc.addProperty("saturationRatio", saturationRatio); + return foodDesc; + } + + @Override + public String getDataName() { + return "foods"; + } + + public JsonArray generateDataJson() { + JsonArray resultsArray = new JsonArray(); + Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); + itemRegistry.stream() + .filter(i -> i.getComponents().contains(DataComponentTypes.FOOD)) + .forEach(food -> resultsArray.add(generateFoodDescriptor(itemRegistry, food))); + return resultsArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java new file mode 100644 index 0000000..e7b9b54 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -0,0 +1,25 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import net.minecraft.block.enums.Instrument; + +public class InstrumentsDataGenerator implements IDataGenerator { + @Override + public String getDataName() { + return "instruments"; + } + + @Override + public JsonElement generateDataJson() { + JsonArray array = new JsonArray(); + for (Instrument instrument : Instrument.values()) { + JsonObject object = new JsonObject(); + object.addProperty("id", instrument.ordinal()); + object.addProperty("name", instrument.asString()); + array.add(object); + } + return array; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java new file mode 100644 index 0000000..836cf5a --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java @@ -0,0 +1,88 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class ItemsDataGenerator implements IDataGenerator { + + private static List calculateItemsToRepairWith(Registry itemRegistry, Item sourceItem) { + ItemStack sourceItemStack = sourceItem.getDefaultStack(); + return itemRegistry.stream() + .filter(otherItem -> sourceItem.canRepair(sourceItemStack, otherItem.getDefaultStack())) + .collect(Collectors.toList()); + } + + private static List> getApplicableEnchantmentTargets(Item sourceItem) { + return sourceItem.getComponents().get(DataComponentTypes.ENCHANTMENTS) + .getEnchantments() + .stream() + .map(RegistryEntry::value) + .map(Enchantment::getApplicableItems) + .toList(); + } + + public static JsonObject generateItem(Registry itemRegistry, Item item) { + JsonObject itemDesc = new JsonObject(); + Identifier registryKey = itemRegistry.getKey(item).orElseThrow().getValue(); + + itemDesc.addProperty("id", itemRegistry.getRawId(item)); + itemDesc.addProperty("name", registryKey.getPath()); + + itemDesc.addProperty("displayName", DGU.translateText(item.getTranslationKey())); + itemDesc.addProperty("stackSize", item.getMaxCount()); + + List> enchantmentTargets = getApplicableEnchantmentTargets(item); + + JsonArray enchantCategoriesArray = new JsonArray(); + for (TagKey target : enchantmentTargets) { + enchantCategoriesArray.add(EnchantmentsDataGenerator.getEnchantmentTargetName(target)); + } + if (enchantCategoriesArray.size() > 0) { + itemDesc.add("enchantCategories", enchantCategoriesArray); + } + + if (item.getComponents().contains(DataComponentTypes.DAMAGE)) { + List repairWithItems = calculateItemsToRepairWith(itemRegistry, item); + + JsonArray fixedWithArray = new JsonArray(); + for (Item repairWithItem : repairWithItems) { + Identifier repairWithName = itemRegistry.getKey(repairWithItem).orElseThrow().getValue(); + fixedWithArray.add(repairWithName.getPath()); + } + if (fixedWithArray.size() > 0) { + itemDesc.add("repairWith", fixedWithArray); + } + + int maxDurability = Objects.requireNonNull(item.getComponents().get(DataComponentTypes.MAX_DAMAGE)); + itemDesc.addProperty("maxDurability", maxDurability); + } + return itemDesc; + } + + @Override + public String getDataName() { + return "items"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultArray = new JsonArray(); + Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); + itemRegistry.stream().forEach(item -> resultArray.add(generateItem(itemRegistry, item))); + return resultArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/LanguageDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/LanguageDataGenerator.java new file mode 100644 index 0000000..7a3c6ce --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/LanguageDataGenerator.java @@ -0,0 +1,27 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.util.Objects; + +public class LanguageDataGenerator implements IDataGenerator { + @Override + public String getDataName() { + return "language"; + } + + @Override + public JsonElement generateDataJson() { + try { + InputStream inputStream = Objects.requireNonNull(this.getClass().getResourceAsStream("/assets/minecraft/lang/en_us.json")); + return new Gson().fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), JsonObject.class); + } catch (Exception ignored) { + } + throw new RuntimeException("Failed to generate language file"); + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java new file mode 100644 index 0000000..46e42b4 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -0,0 +1,211 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.item.MiningToolItem; +import net.minecraft.item.SwordItem; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; + +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +//TODO entire idea of linking materials to tool speeds is obsolete and just wrong now, +//TODO but we kinda have to support it to let old code work for computing digging times, +//TODO so for now we will handle materials as "virtual" ones based on which tools can break blocks +public class MaterialsDataGenerator implements IDataGenerator { + + private static final List> COMPOSITE_MATERIALS = ImmutableList.>builder() + .add(ImmutableList.of("plant", makeMaterialNameForTag(BlockTags.AXE_MINEABLE))) + .add(ImmutableList.of("gourd", makeMaterialNameForTag(BlockTags.AXE_MINEABLE))) + .add(ImmutableList.of(makeMaterialNameForTag(BlockTags.LEAVES), makeMaterialNameForTag(BlockTags.HOE_MINEABLE))) + .add(ImmutableList.of(makeMaterialNameForTag(BlockTags.LEAVES), makeMaterialNameForTag(BlockTags.AXE_MINEABLE), makeMaterialNameForTag(BlockTags.HOE_MINEABLE))) + .add(ImmutableList.of("vine_or_glow_lichen", "plant", makeMaterialNameForTag(BlockTags.AXE_MINEABLE) + )).build(); + + private static String makeMaterialNameForTag(TagKey tag) { + return tag.id().getPath(); + } + + private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { + String compositeMaterialName = String.join(";", combinedMaterials); + + List mappedMaterials = combinedMaterials.stream() + .map(otherName -> allMaterials.stream() + .filter(other -> other.getMaterialName().equals(otherName)) + .findFirst().orElseThrow(() -> new RuntimeException("Material not found with name " + otherName))) + .collect(Collectors.toList()); + + Predicate compositePredicate = blockState -> + mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); + + MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); + allMaterials.addFirst(materialInfo); + } + + private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { + String compositeMaterialName = String.join(";", combinedMaterials); + + Map resultingToolSpeeds = new LinkedHashMap<>(); + combinedMaterials.stream() + .map(allMaterials::get) + .forEach(resultingToolSpeeds::putAll); + allMaterials.put(compositeMaterialName, resultingToolSpeeds); + } + + public static List getGlobalMaterialInfo() { + ArrayList resultList = new ArrayList<>(); + + resultList.add(new MaterialInfo("vine_or_glow_lichen", blockState -> blockState.isOf(Blocks.VINE) || blockState.isOf(Blocks.GLOW_LICHEN))); + resultList.add(new MaterialInfo("coweb", blockState -> blockState.isOf(Blocks.COBWEB))); + + resultList.add(new MaterialInfo("leaves", blockState -> blockState.isIn(BlockTags.LEAVES))); + resultList.add(new MaterialInfo("wool", blockState -> blockState.isIn(BlockTags.WOOL))); + + // Block Materials were removed in 1.20 in favor of block tags + resultList.add(new MaterialInfo("gourd", blockState -> blockState.isOf(Blocks.MELON) || blockState.isOf(Blocks.PUMPKIN) || blockState.isOf(Blocks.JACK_O_LANTERN))); + // 'sword_efficient' tag is for all plants, and includes everything from the old PLANT and REPLACEABLE_PLANT materials (see https://minecraft.fandom.com/wiki/Tag#Blocks) + resultList.add(new MaterialInfo("plant", blockState -> blockState.isIn(BlockTags.SWORD_EFFICIENT))); + + HashSet uniqueMaterialNames = new HashSet<>(); + + Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); + itemRegistry.forEach(item -> { + if (item instanceof MiningToolItem toolItem) { + item.getComponents().get(DataComponentTypes.TOOL).rules() + .stream().map(rule -> rule.blocks()) + .forEach(blocks -> { + Optional> tagKey = blocks.getTagKey(); + if (tagKey.isPresent()) { + String materialName = makeMaterialNameForTag((tagKey.get())); + + if (!uniqueMaterialNames.contains(materialName)) { + uniqueMaterialNames.add(materialName); + resultList.add(new MaterialInfo(materialName, blockState -> blockState.isIn(blocks))); + } + } + }); + } + }); + + COMPOSITE_MATERIALS.forEach(values -> createCompositeMaterialInfo(resultList, values)); + return resultList; + } + + @Override + public String getDataName() { + return "materials"; + } + + @Override + public JsonElement generateDataJson() { + Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); + + Map> materialMiningSpeeds = new LinkedHashMap<>(); + materialMiningSpeeds.put("default", ImmutableMap.of()); + + //Special materials used for shears and swords special mining speed logic + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); + + materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); + materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); + materialMiningSpeeds.put("plant", plantMaterialSpeeds); + materialMiningSpeeds.put("gourd", gourdMaterialSpeeds); + + //Shears need special handling because they do not follow normal rules like tools + leavesMaterialSpeeds.put(Items.SHEARS, 15.0f); + cowebMaterialSpeeds.put(Items.SHEARS, 15.0f); + materialMiningSpeeds.put("vine_or_glow_lichen", ImmutableMap.of(Items.SHEARS, 2.0f)); + materialMiningSpeeds.put("wool", ImmutableMap.of(Items.SHEARS, 5.0f)); + + itemRegistry.forEach(item -> { + //Tools are handled rather easily and do not require anything else + if (item instanceof MiningToolItem toolItem) { + item.getComponents().get(DataComponentTypes.TOOL).rules() + .stream().map(rule -> rule.blocks()) + .forEach(blocks -> { + Optional> tagKey = blocks.getTagKey(); + if (tagKey.isPresent()) { + String materialName = makeMaterialNameForTag(tagKey.get()); + + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); + float miningSpeed = item.getComponents().get(DataComponentTypes.TOOL).defaultMiningSpeed(); + materialSpeeds.put(item, miningSpeed); + } + } + ); + + //Swords require special treatment + if (item instanceof SwordItem) { + cowebMaterialSpeeds.put(item, 15.0f); + plantMaterialSpeeds.put(item, 1.5f); + leavesMaterialSpeeds.put(item, 1.5f); + gourdMaterialSpeeds.put(item, 1.5f); + } + }}); + + COMPOSITE_MATERIALS.forEach(values -> createCompositeMaterial(materialMiningSpeeds, values)); + + JsonObject resultObject = new JsonObject(); + + for (var entry : materialMiningSpeeds.entrySet()) { + JsonObject toolSpeedsObject = new JsonObject(); + + for (var toolEntry : entry.getValue().entrySet()) { + int rawItemId = itemRegistry.getRawId(toolEntry.getKey()); + toolSpeedsObject.addProperty(Integer.toString(rawItemId), toolEntry.getValue()); + } + resultObject.add(entry.getKey(), toolSpeedsObject); + } + + return resultObject; + } + + public static class MaterialInfo { + private final String materialName; + private final Predicate predicate; + private final List includedMaterials = new ArrayList<>(); + + public MaterialInfo(String materialName, Predicate predicate) { + this.materialName = materialName; + this.predicate = predicate; + } + + protected MaterialInfo includes(List otherMaterials) { + this.includedMaterials.addAll(otherMaterials); + return this; + } + + public String getMaterialName() { + return materialName; + } + + public Predicate getPredicate() { + return predicate; + } + + public boolean includesMaterial(MaterialInfo materialInfo) { + return includedMaterials.contains(materialInfo); + } + + @Override + public String toString() { + return materialName; + } + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java new file mode 100644 index 0000000..bc5a9ac --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -0,0 +1,33 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.particle.ParticleType; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +public class ParticlesDataGenerator implements IDataGenerator { + public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { + JsonObject effectDesc = new JsonObject(); + Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); + + effectDesc.addProperty("id", registry.getRawId(particleType)); + effectDesc.addProperty("name", registryKey.getPath()); + return effectDesc; + } + + @Override + public String getDataName() { + return "particles"; + } + + @Override + public JsonArray generateDataJson() { + JsonArray resultsArray = new JsonArray(); + Registry> particleTypeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.PARTICLE_TYPE); + particleTypeRegistry.forEach(particleType -> resultsArray.add(generateParticleType(particleTypeRegistry, particleType))); + return resultsArray; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java new file mode 100644 index 0000000..ea489d1 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -0,0 +1,128 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.item.Item; +import net.minecraft.recipe.*; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.RegistryKeys; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class RecipeDataGenerator implements IDataGenerator { + + private static int getRawIdFor(Item item) { + return DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM).getRawId(item); + } + + @Override + public String getDataName() { + return "recipes"; + } + + @Override + public JsonElement generateDataJson() { + DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager(); + JsonObject finalObj = new JsonObject(); + Multimap recipes = ArrayListMultimap.create(); + for (RecipeEntry recipeE : Objects.requireNonNull(DGU.getWorld()).getRecipeManager().values()) { + Recipe recipe = recipeE.value(); + if (recipe instanceof ShapedRecipe sr) { + var ingredients = sr.getIngredients(); + List ingr = new ArrayList<>(); + for (int i = 0; i < 9; i++) { + if (i >= ingredients.size()) { + ingr.add(-1); + continue; + } + var stacks = ingredients.get(i); + var matching = stacks.getMatchingStacks(); + if (matching.length == 0) { + ingr.add(-1); + } else { + ingr.add(getRawIdFor(matching[0].getItem())); + } + } + //Lists.reverse(ingr); + + JsonArray inShape = new JsonArray(); + + + var iter = ingr.iterator(); + for (int y = 0; y < sr.getHeight(); y++) { + var jsonRow = new JsonArray(); + for (int z = 0; z < sr.getWidth(); z++) { + jsonRow.add(iter.next()); + } + inShape.add(jsonRow); + } + + JsonObject finalRecipe = new JsonObject(); + finalRecipe.add("inShape", inShape); + + var resultObject = new JsonObject(); + resultObject.addProperty("id", getRawIdFor(sr.getResult(registryManager).getItem())); + resultObject.addProperty("count", sr.getResult(registryManager).getCount()); + finalRecipe.add("result", resultObject); + + String id = ((Integer) getRawIdFor(sr.getResult(registryManager).getItem())).toString(); + + if (!finalObj.has(id)) { + finalObj.add(id, new JsonArray()); + } + finalObj.get(id).getAsJsonArray().add(finalRecipe); +// var input = new JsonArray(); +// var ingredients = sr.getIngredients().stream().toList(); +// for (int y = 0; y < sr.getHeight(); y++) { +// var arr = new JsonArray(); +// for (int x = 0; x < sr.getWidth(); x++) { +// if ((y*3)+x >= ingredients.size()) { +// arr.add(JsonNull.INSTANCE); +// continue; +// } +// var ingredient = ingredients.get((y*3)+x).getMatchingStacks(); // FIXME: fix when there are more than one matching stack +// if (ingredient.length == 0) { +// arr.add(JsonNull.INSTANCE); +// } else { +// arr.add(getRawIdFor(ingredient[0].getItem())); +// } +// } +// input.add(arr); +// } +// var rootRecipeObject = new JsonObject(); +// rootRecipeObject.add("inShape", input); +// var resultObject = new JsonObject(); +// resultObject.addProperty("id", getRawIdFor(sr.getOutput().getItem())); +// resultObject.addProperty("count", sr.getOutput().getCount()); +// rootRecipeObject.add("result", resultObject); +// recipes.put(getRawIdFor(sr.getOutput().getItem()), rootRecipeObject); + } else if (recipe instanceof ShapelessRecipe sl) { + var ingredients = new JsonArray(); + for (Ingredient ingredient : sl.getIngredients()) { + if (ingredient.isEmpty()) continue; + ingredients.add(getRawIdFor(ingredient.getMatchingStacks()[0].getItem())); + } + var rootRecipeObject = new JsonObject(); + rootRecipeObject.add("ingredients", ingredients); + var resultObject = new JsonObject(); + resultObject.addProperty("id", getRawIdFor(sl.getResult(registryManager).getItem())); + resultObject.addProperty("count", sl.getResult(registryManager).getCount()); + rootRecipeObject.add("result", resultObject); + recipes.put(getRawIdFor(sl.getResult(registryManager).getItem()), rootRecipeObject); + } + } + recipes.forEach((a, b) -> { + if (!finalObj.has(a.toString())) { + finalObj.add(a.toString(), new JsonArray()); + } + finalObj.get(a.toString()).getAsJsonArray().add(b); + }); + return finalObj; + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java new file mode 100644 index 0000000..5c21246 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -0,0 +1,158 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import dev.u9g.minecraftdatagenerator.util.DGU; +import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.block.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.biome.Biome; + +import java.util.*; + +public class TintsDataGenerator implements IDataGenerator { + public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { + BiomeTintColors colors = new BiomeTintColors(); + + biomeRegistry.forEach(biome -> { + int biomeGrassColor = biome.getGrassColorAt(0.0, 0.0); + int biomeFoliageColor = biome.getFoliageColor(); + int biomeWaterColor = biome.getWaterColor(); + + colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); + colors.foliageColoursMap.computeIfAbsent(biomeFoliageColor, k -> new ArrayList<>()).add(biome); + colors.waterColourMap.computeIfAbsent(biomeWaterColor, k -> new ArrayList<>()).add(biome); + }); + return colors; + } + + public static Map generateRedstoneTintColors() { + Map resultColors = new LinkedHashMap<>(); + + for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { + int color = RedstoneWireBlock.getWireColor(redstoneLevel); + resultColors.put(redstoneLevel, color); + } + return resultColors; + } + + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + } + + public static Map generateConstantTintColors() { + Map resultColors = new LinkedHashMap<>(); + + resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); + resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); + + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); + + //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); + + return resultColors; + } + + private static JsonObject encodeBiomeColorMap(Registry biomeRegistry, Map> colorsMap) { + JsonArray resultColorsArray = new JsonArray(); + for (var entry : colorsMap.entrySet()) { + JsonObject entryObject = new JsonObject(); + + JsonArray keysArray = new JsonArray(); + for (Biome biome : entry.getValue()) { + Identifier registryKey = biomeRegistry.getKey(biome).orElseThrow().getValue(); + keysArray.add(registryKey.getPath()); + } + + entryObject.add("keys", keysArray); + entryObject.addProperty("color", entry.getKey()); + resultColorsArray.add(entryObject); + } + + JsonObject resultObject = new JsonObject(); + resultObject.add("data", resultColorsArray); + return resultObject; + } + + private static JsonObject encodeRedstoneColorMap(Map colorsMap) { + JsonArray resultColorsArray = new JsonArray(); + for (var entry : colorsMap.entrySet()) { + JsonObject entryObject = new JsonObject(); + + JsonArray keysArray = new JsonArray(); + keysArray.add(entry.getKey()); + + entryObject.add("keys", keysArray); + entryObject.addProperty("color", entry.getValue()); + resultColorsArray.add(entryObject); + } + + JsonObject resultObject = new JsonObject(); + resultObject.add("data", resultColorsArray); + return resultObject; + } + + private static JsonObject encodeBlocksColorMap(Registry blockRegistry, Map colorsMap) { + JsonArray resultColorsArray = new JsonArray(); + for (var entry : colorsMap.entrySet()) { + JsonObject entryObject = new JsonObject(); + + JsonArray keysArray = new JsonArray(); + Identifier registryKey = blockRegistry.getKey(entry.getKey()).orElseThrow().getValue(); + keysArray.add(registryKey.getPath()); + + entryObject.add("keys", keysArray); + entryObject.addProperty("color", entry.getValue()); + resultColorsArray.add(entryObject); + } + + JsonObject resultObject = new JsonObject(); + resultObject.add("data", resultColorsArray); + return resultObject; + } + + @Override + public String getDataName() { + return "tints"; + } + + @Override + public JsonObject generateDataJson() { + DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager(); + Registry biomeRegistry = registryManager.get(RegistryKeys.BIOME); + Registry blockRegistry = registryManager.get(RegistryKeys.BLOCK); + + BiomeTintColors biomeTintColors = generateBiomeTintColors(biomeRegistry); + Map redstoneColors = generateRedstoneTintColors(); + Map constantTintColors = generateConstantTintColors(); + + JsonObject resultObject = new JsonObject(); + + resultObject.add("grass", encodeBiomeColorMap(biomeRegistry, biomeTintColors.grassColoursMap)); + resultObject.add("foliage", encodeBiomeColorMap(biomeRegistry, biomeTintColors.foliageColoursMap)); + resultObject.add("water", encodeBiomeColorMap(biomeRegistry, biomeTintColors.waterColourMap)); + + resultObject.add("redstone", encodeRedstoneColorMap(redstoneColors)); + resultObject.add("constant", encodeBlocksColorMap(blockRegistry, constantTintColors)); + + return resultObject; + } + + public static class BiomeTintColors { + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EULAMixin.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EULAMixin.java new file mode 100644 index 0000000..0d297e7 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EULAMixin.java @@ -0,0 +1,15 @@ +package dev.u9g.minecraftdatagenerator.mixin; + +import net.minecraft.server.dedicated.EulaReader; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(EulaReader.class) +public class EULAMixin { + @Inject(method = "isEulaAgreedTo()Z", at = @At("TAIL"), cancellable = true) + public void init(CallbackInfoReturnable cir) { + cir.setReturnValue(true); + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java new file mode 100644 index 0000000..cf8d9ff --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -0,0 +1,22 @@ +package dev.u9g.minecraftdatagenerator.mixin; + +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; +import dev.u9g.minecraftdatagenerator.util.DGU; +import net.minecraft.MinecraftVersion; +import net.minecraft.server.dedicated.MinecraftDedicatedServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(MinecraftDedicatedServer.class) +public class ReadyMixin { + + @Inject(method = "setupServer()Z", at = @At("TAIL")) + private void init(CallbackInfoReturnable cir) { + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java new file mode 100644 index 0000000..3946c1f --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -0,0 +1,21 @@ +package dev.u9g.minecraftdatagenerator.util; + +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.Language; +import net.minecraft.world.World; + +public class DGU { + @SuppressWarnings("deprecation") + public static MinecraftServer getCurrentlyRunningServer() { + return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); + } + + public static String translateText(String translationKey) { + return Language.getInstance().get(translationKey); + } + + public static World getWorld() { + return getCurrentlyRunningServer().getOverworld(); + } +} diff --git a/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java new file mode 100644 index 0000000..460efd8 --- /dev/null +++ b/1.20.5/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java @@ -0,0 +1,72 @@ +package dev.u9g.minecraftdatagenerator.util; + +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockRenderView; +import net.minecraft.world.LightType; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.BiomeKeys; +import net.minecraft.world.biome.ColorResolver; +import net.minecraft.world.chunk.light.LightingProvider; +import org.jetbrains.annotations.Nullable; + +public enum EmptyRenderBlockView implements BlockRenderView { + INSTANCE; + + @Nullable + public BlockEntity getBlockEntity(BlockPos pos) { + return null; + } + + public BlockState getBlockState(BlockPos pos) { + return Blocks.AIR.getDefaultState(); + } + + public FluidState getFluidState(BlockPos pos) { + return Fluids.EMPTY.getDefaultState(); + } + + public int getBottomY() { + return 0; + } + + public int getHeight() { + return 0; + } + + + @Override + public float getBrightness(Direction direction, boolean shaded) { + return 0.0f; + } + + @Override + public LightingProvider getLightingProvider() { + return null; + } + + @Override + public int getColor(BlockPos pos, ColorResolver colorResolver) { + Registry biomeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME); + Biome plainsBiome = biomeRegistry.get(BiomeKeys.PLAINS); + + return colorResolver.getColor(plainsBiome, pos.getX(), pos.getY()); + } + + @Override + public int getLightLevel(LightType type, BlockPos pos) { + return type == LightType.SKY ? getMaxLightLevel() : 0; + } + + @Override + public int getBaseLightLevel(BlockPos pos, int ambientDarkness) { + return ambientDarkness; + } +} diff --git a/1.20.5/src/main/resources/fabric.mod.json b/1.20.5/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..ffac96b --- /dev/null +++ b/1.20.5/src/main/resources/fabric.mod.json @@ -0,0 +1,20 @@ +{ + "schemaVersion": 1, + "id": "minecraft-data-generator", + "version": "${version}", + "name": "Minecraft Data Generator", + "description": "", + "authors": [ + "Archengius", + "U9G" + ], + "contact": {}, + "license": "MIT", + "mixins": [ + "minecraft-data-generator.mixins.json" + ], + "depends": { + "fabricloader": "*", + "minecraft": "*" + } +} diff --git a/1.20.5/src/main/resources/minecraft-data-generator.mixins.json b/1.20.5/src/main/resources/minecraft-data-generator.mixins.json new file mode 100644 index 0000000..8218596 --- /dev/null +++ b/1.20.5/src/main/resources/minecraft-data-generator.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "dev.u9g.minecraftdatagenerator.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "EULAMixin", + "ReadyMixin" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/1.20/build.gradle b/1.20/build.gradle index e85de39..90cfd95 100644 --- a/1.20/build.gradle +++ b/1.20/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "1.20" + + mappings { + intermediary() + yarn(1) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.20/gradle.properties b/1.20/gradle.properties deleted file mode 100644 index 1818770..0000000 --- a/1.20/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.14.24 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.90.4+1.20.2 diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index bda5f96..a1b3b73 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -2,36 +2,24 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.TheEndBiomeDataAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; -import net.fabricmc.fabric.api.biome.v1.NetherBiomes; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.BiomeTags; import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; -import java.util.HashSet; -import java.util.Set; - public class BiomesDataGenerator implements IDataGenerator { - private static final Set> END_BIOMES = new HashSet<>(); - - static { - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BIOMES_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_BARRENS_MAP().keySet()); - END_BIOMES.addAll(TheEndBiomeDataAccessor.END_MIDLANDS_MAP().keySet()); - } - - private static String guessBiomeDimensionFromCategory(Biome biome, String biomeName) { - var key = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME).getKey(biome).orElseThrow(); - if (NetherBiomes.canGenerateInNether(key)) { + private static String guessBiomeDimensionFromCategory(Biome biome) { + var biomeRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BIOME); + if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_NETHER)) { return "nether"; - } else if (END_BIOMES.contains(key) || biomeName.startsWith("end_")) { + } else if (biomeRegistry.getEntry(biome).isIn(BiomeTags.IS_END)) { return "end"; + } else { + return "overworld"; } - return "overworld"; } private static String guessCategoryBasedOnName(String name, String dimension) { @@ -87,196 +75,6 @@ public class BiomesDataGenerator implements IDataGenerator { } } - private static int getBiomeColorFor(String biomeName) { - switch (biomeName) { - case "the_void" -> { - return 0; - } - case "plains" -> { - return 9286496; - } - case "sunflower_plains" -> { - return 11918216; - } - case "snowy_plains" -> { - return 16777215; - } - case "ice_spikes" -> { - return 11853020; - } - case "desert" -> { - return 16421912; - } - case "swamp" -> { - return 522674; - } - case "forest" -> { - return 353825; - } - case "flower_forest" -> { - return 2985545; - } - case "birch_forest" -> { - return 3175492; - } - case "dark_forest" -> { - return 4215066; - } - case "old_growth_birch_forest" -> { - return 5807212; - } - case "old_growth_pine_taiga" -> { - return 5858897; - } - case "old_growth_spruce_taiga" -> { - return 8490617; - } - case "taiga" -> { - return 747097; - } - case "snowy_taiga" -> { - return 3233098; - } - case "savanna" -> { - return 12431967; - } - case "savanna_plateau" -> { - return 10984804; - } - case "windswept_hills" -> { - return 6316128; - } - case "windswept_gravelly_hills" -> { - return 8947848; - } - case "windswept_forest" -> { - return 2250012; - } - case "windswept_savanna" -> { - return 15063687; - } - case "jungle" -> { - return 5470985; - } - case "sparse_jungle" -> { - return 6458135; - } - case "bamboo_jungle" -> { - return 7769620; - } - case "badlands" -> { - return 14238997; - } - case "eroded_badlands" -> { - return 16739645; - } - case "wooded_badlands" -> { - return 11573093; - } - case "meadow" -> { - return 9217136; - } - case "grove" -> { - return 14675173; - } - case "snowy_slopes" -> { - return 14348785; - } - case "frozen_peaks" -> { - return 15399931; - } - case "jagged_peaks" -> { - return 14937325; - } - case "stony_peaks" -> { - return 13750737; - } - case "river" -> { - return 255; - } - case "frozen_river" -> { - return 10526975; - } - case "beach" -> { - return 16440917; - } - case "snowy_beach" -> { - return 16445632; - } - case "stony_shore" -> { - return 10658436; - } - case "warm_ocean" -> { - return 172; - } - case "lukewarm_ocean" -> { - return 144; - } - case "deep_lukewarm_ocean" -> { - return 64; - } - case "ocean" -> { - return 112; - } - case "deep_ocean" -> { - return 48; - } - case "cold_ocean" -> { - return 2105456; - } - case "deep_cold_ocean" -> { - return 2105400; - } - case "frozen_ocean" -> { - return 7368918; - } - case "deep_frozen_ocean" -> { - return 4210832; - } - case "mushroom_fields" -> { - return 16711935; - } - case "dripstone_caves" -> { - return 12690831; - } - case "lush_caves" -> { - return 14652980; - } - case "nether_wastes" -> { - return 12532539; - } - case "warped_forest" -> { - return 4821115; - } - case "crimson_forest" -> { - return 14485512; - } - case "soul_sand_valley" -> { - return 6174768; - } - case "basalt_deltas" -> { - return 4208182; - } - case "the_end" -> { - return 8421631; - } - case "end_highlands" -> { - return 12828041; - } - case "end_midlands" -> { - return 15464630; - } - case "small_end_islands" -> { - return 42; - } - case "end_barrens" -> { - return 9474162; - } - } - System.out.println("Don't know the color of biome: '" + biomeName + "'"); - return 0; - } - public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { JsonObject biomeDesc = new JsonObject(); Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); @@ -284,7 +82,7 @@ public class BiomesDataGenerator implements IDataGenerator { String name = registryKey.getPath(); biomeDesc.addProperty("id", registry.getRawId(biome)); biomeDesc.addProperty("name", name); - String dimension = guessBiomeDimensionFromCategory(biome, name); + String dimension = guessBiomeDimensionFromCategory(biome); biomeDesc.addProperty("category", guessCategoryBasedOnName(name, dimension)); biomeDesc.addProperty("temperature", biome.getTemperature()); //biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName());// - removed in 1.19.4 @@ -292,7 +90,7 @@ public class BiomesDataGenerator implements IDataGenerator { //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source biomeDesc.addProperty("dimension", dimension); biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); - biomeDesc.addProperty("color", getBiomeColorFor(registryKey.getPath())); + biomeDesc.addProperty("color", biome.getSkyColor()); //biomeDesc.addProperty("rainfall", biome.getDownfall());// - removed in 1.19.4 return biomeDesc; diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 8b9d0e0..68a169c 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -14,10 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -42,8 +39,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -72,7 +69,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 44e8e29..324b4d9 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.registry.Registry; +import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKeys; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registries.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registries.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -189,10 +189,9 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK); List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + Registries.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index ebf2ed5..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,78 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 3c619c3..dd6dc01 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -14,7 +14,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 6bd50d7..d00d886 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 @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -12,29 +11,10 @@ import net.minecraft.util.Identifier; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { - - private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") - .put(EnchantmentTarget.VANISHABLE, "vanishable") - .build(); - public static String getEnchantmentTargetName(EnchantmentTarget target) { - return ENCHANTMENT_TARGET_NAMES.getOrDefault(target, target.name().toLowerCase(Locale.ROOT)); + return target.name().toLowerCase(Locale.ROOT); } //Equation enchantment costs follow is a * level + b, so we can easily retrieve a and b by passing zero level diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index 37d4fb1..94a0ca6 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.EntityTypeAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -20,7 +19,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -48,11 +46,8 @@ public class EntitiesDataGenerator implements IDataGenerator { } private static String getCategoryFrom(EntityType entityType) { - if (entityType == EntityType.PLAYER) return "UNKNOWN"; // fail early for player entities - /*public T create(World world) { - return this.factory.create(this, world); - }*/ - Entity entity = ((EntityTypeAccessor) entityType).factory().create(entityType, DGU.getWorld()); + if (entityType == EntityType.PLAYER) return "UNKNOWN"; + Entity entity = entityType.create(DGU.getWorld()); if (entity == null) throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); entity.discard(); diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index a5b164f..97a7363 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -12,7 +12,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 9a5fac1..674dd22 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -41,7 +40,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -53,13 +52,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -108,14 +107,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.ITEM); - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -134,7 +133,7 @@ public class MaterialsDataGenerator implements IDataGenerator { TagKey effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index e446a50..bc5a9ac 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -9,7 +9,6 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index ea489d1..6133772 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -7,7 +7,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.item.Item; -import net.minecraft.recipe.*; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.ShapedRecipe; +import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.RegistryKeys; @@ -31,8 +34,7 @@ public class RecipeDataGenerator implements IDataGenerator { DynamicRegistryManager registryManager = DGU.getWorld().getRegistryManager(); JsonObject finalObj = new JsonObject(); Multimap recipes = ArrayListMultimap.create(); - for (RecipeEntry recipeE : Objects.requireNonNull(DGU.getWorld()).getRecipeManager().values()) { - Recipe recipe = recipeE.value(); + for (Recipe recipe : Objects.requireNonNull(DGU.getWorld()).getRecipeManager().values()) { if (recipe instanceof ShapedRecipe sr) { var ingredients = sr.getIngredients(); List ingr = new ArrayList<>(); @@ -67,11 +69,11 @@ public class RecipeDataGenerator implements IDataGenerator { finalRecipe.add("inShape", inShape); var resultObject = new JsonObject(); - resultObject.addProperty("id", getRawIdFor(sr.getResult(registryManager).getItem())); - resultObject.addProperty("count", sr.getResult(registryManager).getCount()); + resultObject.addProperty("id", getRawIdFor(sr.getOutput(registryManager).getItem())); + resultObject.addProperty("count", sr.getOutput(registryManager).getCount()); finalRecipe.add("result", resultObject); - String id = ((Integer) getRawIdFor(sr.getResult(registryManager).getItem())).toString(); + String id = ((Integer) getRawIdFor(sr.getOutput(registryManager).getItem())).toString(); if (!finalObj.has(id)) { finalObj.add(id, new JsonArray()); @@ -111,10 +113,10 @@ public class RecipeDataGenerator implements IDataGenerator { var rootRecipeObject = new JsonObject(); rootRecipeObject.add("ingredients", ingredients); var resultObject = new JsonObject(); - resultObject.addProperty("id", getRawIdFor(sl.getResult(registryManager).getItem())); - resultObject.addProperty("count", sl.getResult(registryManager).getCount()); + resultObject.addProperty("id", getRawIdFor(sl.getOutput(registryManager).getItem())); + resultObject.addProperty("count", sl.getOutput(registryManager).getCount()); rootRecipeObject.add("result", resultObject); - recipes.put(getRawIdFor(sl.getResult(registryManager).getItem()), rootRecipeObject); + recipes.put(getRawIdFor(sl.getOutput(registryManager).getItem()), rootRecipeObject); } } recipes.forEach((a, b) -> { diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 77e54d4..e390655 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,17 +2,14 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.util.DGU; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.Registries; import net.minecraft.sound.SoundEvent; public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)+1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead. + soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead. soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; @@ -26,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = DGU.getWorld().getRegistryManager().get(RegistryKeys.SOUND_EVENT); - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registries.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 1f4f96b..5c21246 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -2,12 +2,12 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mojangannoyances.BlockColors; import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.world.FoliageColors; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.Registry; @@ -16,13 +16,9 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -39,7 +35,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -48,24 +44,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -156,8 +151,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java deleted file mode 100644 index 3e62bf5..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/EntityTypeAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(EntityType.class) -public interface EntityTypeAccessor { - @Accessor("factory") - EntityType.EntityFactory factory(); -} 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 ba3b26b..c904c15 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java deleted file mode 100644 index dc35e0b..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -import net.fabricmc.fabric.impl.biome.WeightedPicker; -import net.minecraft.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - - -@Mixin(TheEndBiomeData.class) -public interface TheEndBiomeDataAccessor { - @Accessor(value = "END_BIOMES_MAP", remap = false) - static Map, WeightedPicker>> END_BIOMES_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_MIDLANDS_MAP", remap = false) - static Map, WeightedPicker>> END_MIDLANDS_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor(value = "END_BARRENS_MAP", remap = false) - static Map, WeightedPicker>> END_BARRENS_MAP() { - throw new IllegalStateException("Should never be called."); - } -} diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java deleted file mode 100644 index d374b11..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BiomeColors.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.ColorResolver; - -@Environment(EnvType.CLIENT) -public class BiomeColors { - public static final ColorResolver GRASS_COLOR = Biome::getGrassColorAt; - public static final ColorResolver FOLIAGE_COLOR = (biome, x, z) -> biome.getFoliageColor(); - public static final ColorResolver WATER_COLOR = (biome, x, z) -> biome.getWaterColor(); - - public BiomeColors() { - } - - private static int getColor(BlockRenderView world, BlockPos pos, ColorResolver resolver) { - return world.getColor(pos, resolver); - } - - public static int getGrassColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockRenderView world, BlockPos pos) { - return getColor(world, pos, WATER_COLOR); - } -} - diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java deleted file mode 100644 index ac5dc57..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColorProvider.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorProvider { - int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex); -} - 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 deleted file mode 100644 index a0a3bdf..0000000 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/mojangannoyances/BlockColors.java +++ /dev/null @@ -1,94 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mojangannoyances; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import dev.u9g.minecraftdatagenerator.util.DGU; -import net.minecraft.block.*; -import net.minecraft.block.enums.DoubleBlockHalf; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.client.color.world.GrassColors; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.state.property.Property; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockRenderView; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; - -import java.util.Map; -import java.util.Set; - -public class BlockColors { - private static final int NO_COLOR = -1; - private final IdList providers = new IdList<>(32); - private final Map>> properties = Maps.newHashMap(); - - public BlockColors() { - } - - public static BlockColors create() { - BlockColors blockColors = new BlockColors(); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, state.get(TallPlantBlock.HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos) : -1, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProperty(TallPlantBlock.HALF, Blocks.LARGE_FERN, Blocks.TALL_GRASS); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getColor(0.5, 1.0), Blocks.GRASS_BLOCK, Blocks.FERN, Blocks.GRASS, Blocks.POTTED_FERN); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> FoliageColors.getSpruceColor(), Blocks.SPRUCE_LEAVES); - 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(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 = state.get(StemBlock.AGE); - int j = i * 32; - int k = 255 - i * 8; - int l = i * 4; - return j << 16 | k << 8 | l; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int getParticleColor(BlockState state, World world, BlockPos pos) { - BlockColorProvider blockColorProvider = this.providers.get(DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(state.getBlock())); - if (blockColorProvider != null) { - return blockColorProvider.getColor(state, null, null, 0); - } else { - MapColor mapColor = state.getMapColor(world, pos); - return mapColor != null ? mapColor.color : -1; - } - } - - public int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { - 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 (Block block : blocks) { - this.providers.set(provider, DGU.getWorld().getRegistryManager().get(RegistryKeys.BLOCK).getRawId(block)); - } - - } - - private void registerColorProperties(Set> properties, Block... blocks) { - int var4 = blocks.length; - - for (Block block : blocks) { - this.properties.put(block, properties); - } - - } - - private void registerColorProperty(Property property, Block... blocks) { - this.registerColorProperties(ImmutableSet.of(property), blocks); - } - - public Set> getProperties(Block block) { - return this.properties.getOrDefault(block, ImmutableSet.of()); - } -} diff --git a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 32c2fb6..3946c1f 100644 --- a/1.20/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.20/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -6,24 +6,13 @@ import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - return getCurrentlyRunningServerDedicated(); - } - - private static String translateTextFallback(String translationKey) { - return language.get(translationKey); - } - public static String translateText(String translationKey) { - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/1.20/src/main/resources/fabric.mod.json b/1.20/src/main/resources/fabric.mod.json index c999d2a..ffac96b 100644 --- a/1.20/src/main/resources/fabric.mod.json +++ b/1.20/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.4", - "fabric": "*", + "fabricloader": "*", "minecraft": "*" } } diff --git a/1.20/src/main/resources/minecraft-data-generator.mixins.json b/1.20/src/main/resources/minecraft-data-generator.mixins.json index f3afe06..d46bf65 100644 --- a/1.20/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.20/src/main/resources/minecraft-data-generator.mixins.json @@ -4,11 +4,9 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "EntityTypeAccessor", "EULAMixin", "MiningToolItemAccessor", - "ReadyMixin", - "TheEndBiomeDataAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/1.7/build.gradle b/1.7/build.gradle index 224e88a..1fe0490 100644 --- a/1.7/build.gradle +++ b/1.7/build.gradle @@ -1,54 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "u9g" - url = "https://maven.u9g.dev" +unimined.minecraft { + version "1.7" + + mappings { + legacyIntermediary() + legacyYarn(514) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://legacyfabric.u9g.dev/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } - // Required by 1.7.x - runs { - client { - programArgs "--userProperties", "{}" - } - } + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -59,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.7/gradle.properties b/1.7/gradle.properties deleted file mode 100644 index 8212c17..0000000 --- a/1.7/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.7 -yarn_mappings=1.7+build.202206071953 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index c032c33..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.block.*; -import net.minecraft.world.biome.Biome; - - -public class BiomeBlockColors { - // generated manually from each Biome's Biome#getBlockColor - public static int getBlockColor(Block block, Biome biome, int blockData) { - if (block instanceof LilyPadBlock) { - return 2129968; - } else if (block instanceof AbstractFluidBlock && block.getMaterial() == Material.WATER) { - int n = 0; - int n2 = 0; - int n3 = 0; - for (int i = -1; i <= 1; ++i) { - for (int j = -1; j <= 1; ++j) { - int n4 = biome.waterColor; - n += (n4 & 0xFF0000) >> 16; - n2 += (n4 & 0xFF00) >> 8; - n3 += n4 & 0xFF; - } - } - return (n / 9 & 0xFF) << 16 | (n2 / 9 & 0xFF) << 8 | n3 / 9 & 0xFF; - } else if (block instanceof AttachedStemBlock) { - int n = blockData * 32; - int n2 = 255 - blockData * 8; - int n3 = blockData * 4; - return n << 16 | n2 << 8 | n3; - } else if (block instanceof RedstoneWireBlock) { - return 0x800000; - } else if (block instanceof DoublePlantBlock) { - int n = ((DoublePlantBlock) block).method_6478(null, 0, 0, 0); - if (n == 2 || n == 3) { - return GrassColors.getGrassColor(biome); - } - } else if (block instanceof GrassBlock) { - int n = 0; - int n2 = 0; - int n3 = 0; - for (int i = -1; i <= 1; ++i) { - for (int j = -1; j <= 1; ++j) { - int n4 = GrassColors.getGrassColor(biome); - n += (n4 & 0xFF0000) >> 16; - n2 += (n4 & 0xFF00) >> 8; - n3 += n4 & 0xFF; - } - } - return (n / 9 & 0xFF) << 16 | (n2 / 9 & 0xFF) << 8 | n3 / 9 & 0xFF; - } else if (block instanceof Leaves1Block) { - if ((blockData & 3) == 1) { - return FoliageColors.getSpruceColor(); - } - if ((blockData & 3) == 2) { - return FoliageColors.getBirchColor(); - } - } else if (block instanceof LeavesBlock) { - int n = 0; - int n2 = 0; - int n3 = 0; - for (int i = -1; i <= 1; ++i) { - for (int j = -1; j <= 1; ++j) { - int n4 = FoliageColors.getColor(biome); - n += (n4 & 0xFF0000) >> 16; - n2 += (n4 & 0xFF00) >> 8; - n3 += n4 & 0xFF; - } - } - return (n / 9 & 0xFF) << 16 | (n2 / 9 & 0xFF) << 8 | n3 / 9 & 0xFF; - } else if (block instanceof SugarCaneBlock) { - return GrassColors.getGrassColor(biome); - } else if (block instanceof TallPlantBlock & blockData != 0) { - return GrassColors.getGrassColor(biome); - } else if (block instanceof VineBlock) { - return FoliageColors.getColor(biome); - } - - return 0xFFFFFF; - } -} 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 deleted file mode 100644 index b5538a6..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,38 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 6396257; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getColor(Biome biome) { - double d = MathHelper.clamp(biome.temperature, 0.0f, 1.0f); - double e = MathHelper.clamp(biome.downfall, 0.0f, 1.0f); - return FoliageColors.getColor(d, e); - } -} - 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 deleted file mode 100644 index 0ca9862..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,27 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - int n = (int) ((1.0 - temperature) * 255.0); - int n2 = (int) ((1.0 - (humidity *= temperature)) * 255.0); - return colorMap[n2 << 8 | n]; - } - - public static int getGrassColor(Biome biome) { - double d = MathHelper.clamp(biome.temperature, 0.0f, 1.0f); - double e = MathHelper.clamp(biome.downfall, 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.7/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/ServerSideRedstoneWireBlock.java deleted file mode 100644 index 75c9f89..0000000 --- a/1.7/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.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index b2d77af..5ba2fbd 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 @@ -93,7 +93,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { // } // } // if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { -// return indexesOfBoxesInTheShapesCache.get(0); +// return indexesOfBoxesInTheShapesCache.getFirst(); // } else { // JsonArray shapeIndexes = new JsonArray(); // indexesOfBoxesInTheShapesCache.forEach(shapeIndex -> shapeIndexes.add(new JsonPrimitive(shapeIndex))); @@ -114,18 +114,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index feaed25..c42ab27 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.accessor.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.accessor.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -17,12 +16,8 @@ import net.minecraft.item.ToolItem; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { @@ -49,7 +44,7 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("displayName", block.getTranslatedName()); } - float hardness = block.getHardness(null, 0, 0, 0); + float hardness = block.method_471(null, 0, 0, 0); blockDesc.addProperty("hardness", hardness); blockDesc.addProperty("resistance", ((BlockAccessor) block).getBlastResistance()); @@ -70,7 +65,7 @@ public class BlocksDataGenerator implements IDataGenerator { } private static String boundingBox(Block block) { - if (block.getCollisionBox(DGU.getWorld(), 0, 0, 0) == null) { + if (block.getBoundingBox(DGU.getWorld(), 0, 0, 0) == null) { return "empty"; } return "block"; 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 deleted file mode 100644 index c2ac739..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); -// register(new BlockCollisionShapesDataGenerator()); - Needs to be finished - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); -// register(new ParticlesDataGenerator()); - See WorldRenderer#spawnParticle - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 66f54d2..cc62267 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -11,7 +11,6 @@ import org.jetbrains.annotations.NotNull; import java.util.Objects; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull String name = Objects.requireNonNull(Registries.STATUS_EFFECTS.getId(statusEffect)); 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 ebfcf93..166b12f 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 @@ -20,7 +20,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); String registryKey = Registries.ENTITY_TYPES.getId(entityClass); @@ -31,7 +30,7 @@ public class EntitiesDataGenerator implements IDataGenerator { entityDesc.addProperty("id", id); entityDesc.addProperty("internalId", id); entityDesc.addProperty("name", Objects.requireNonNull(registryKey)); - String displayName = entity != null ? entity.getTranslatedName() : null; + String displayName = entity != null ? entity.getTranslationKey() : null; if (displayName != null && !displayName.startsWith("entity.")) { entityDesc.addProperty("displayName", displayName); } diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index b93cec8..695238b 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -10,7 +10,6 @@ import net.minecraft.item.Item; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); String registryKey = Registries.ITEMS.getId(foodItem); diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 1054ac8..e028b7b 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -4,7 +4,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import net.minecraft.block.Material; +import net.minecraft.block.material.Material; public class InstrumentsDataGenerator implements IDataGenerator { public static Material currentMaterial = null; diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..f80891e 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,12 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } + // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); 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 414749b..fc1385c 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,32 +3,27 @@ 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.mixin.accessor.BiomeAccessor; -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public Biome getBiome(int x, int z) { - return biome; - } - }; - int biomeGrassColor = GrassColors.getGrassColor(bv.getBiome(0, 0)); - int biomeFoliageColor = FoliageColors.getColor(bv.getBiome(0, 0)); + double d = MathHelper.clamp(biome.temperature, 0.0f, 1.0f); + double e = MathHelper.clamp(biome.downfall, 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -38,24 +33,20 @@ public class TintsDataGenerator implements IDataGenerator { return colors; } - private static int getBlockColor(Block block) { - return BiomeBlockColors.getBlockColor(block, EmptyBlockView.INSTANCE.getBiome(0, 0), 0); - } - public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Registries.BLOCKS.get("waterlily"), getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Registries.BLOCKS.get("waterlily"), Blocks.LILY_PAD.getColor()); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Registries.BLOCKS.get("melon_stem"), getBlockColor(Blocks.MELON_STEM)); - resultColors.put(Registries.BLOCKS.get("pumpkin_stem"), getBlockColor(Blocks.PUMPKIN_STEM)); + resultColors.put(Registries.BLOCKS.get("melon_stem"), Blocks.MELON_STEM.getColor()); + resultColors.put(Registries.BLOCKS.get("pumpkin_stem"), Blocks.PUMPKIN_STEM.getColor()); return resultColors; } @@ -138,8 +129,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/BlocksMixin.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/BlocksMixin.java deleted file mode 100644 index 5a032e4..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/BlocksMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.block.Blocks; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(Blocks.class) -public class BlocksMixin { - @Inject(method = "", at = @At("HEAD")) - private static void doBlocksStaticCtor(CallbackInfo ci) { -// Block.setup(); - } -} 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 7ea7dcb..d70a029 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 @@ -1,9 +1,7 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; -import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -11,20 +9,15 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.io.File; -import java.nio.file.Path; -import java.util.logging.Level; @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Registries.init(); - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + System.setProperty("fabric.development", "false"); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + (new File(".")).toPath() + ); } } diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java index 4aa5ec6..e2f9a19 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java @@ -18,7 +18,7 @@ public abstract class ItemEntityOverwrite extends Entity { * @reason a */ @Overwrite - public String getTranslatedName() { - return super.getTranslatedName(); + public String getTranslationKey() { + return super.getTranslationKey(); } } diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 9f1bf0b..eff7886 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,9 +1,5 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; @@ -15,26 +11,8 @@ public class DGU { return MinecraftServer.getServer(); } - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception err) { - err.printStackTrace(); - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyBlockView.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyBlockView.java deleted file mode 100644 index 6439917..0000000 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyBlockView.java +++ /dev/null @@ -1,61 +0,0 @@ -package dev.u9g.minecraftdatagenerator.util; - -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.class_5093; -import net.minecraft.world.BlockView; -import net.minecraft.world.biome.Biome; - -public class EmptyBlockView implements BlockView { - public static final EmptyBlockView INSTANCE = new EmptyBlockView(); - - @Override - public Block getBlock(int x, int y, int z) { - return null; - } - - @Override - public BlockEntity getBlockEntity(int x, int y, int z) { - return null; - } - - @Override - public int getBlockData(int x, int y, int z) { - return 0; - } - - @Override - public boolean isAir(int x, int y, int z) { - return false; - } - - @Override - public Biome getBiome(int x, int z) { - return null; - } - - @Override - public int method_3771() { - return 0; - } - - @Override - public boolean isEmpty() { - return false; - } - - @Override - public class_5093 method_22399() { - return null; - } - - @Override - public int method_3719(int i, int j, int k, int l) { - return 0; - } - - @Override - public int method_3778(int i, int j, int k, int l) { - return 0; - } -} diff --git a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/Registries.java b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/Registries.java index d345d91..976e8d1 100644 --- a/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/Registries.java +++ b/1.7/src/main/java/dev/u9g/minecraftdatagenerator/util/Registries.java @@ -20,13 +20,23 @@ import java.util.Locale; import java.util.Map; public class Registries { - public static Language LANGUAGE; - public static RegistryView BIOMES; - public static RegistryView BLOCKS; - public static RegistryView ITEMS; - public static RegistryView STATUS_EFFECTS; - public static RegistryView ENCHANTMENTS; - public static RegistryView> ENTITY_TYPES; + public static final Language LANGUAGE; + public static final RegistryView BIOMES; + public static final RegistryView BLOCKS; + public static final RegistryView ITEMS; + public static final RegistryView STATUS_EFFECTS; + public static final RegistryView ENCHANTMENTS; + public static final RegistryView> ENTITY_TYPES; + + static { + LANGUAGE = new Language(); + BIOMES = setupBiomeRegistry(); + BLOCKS = new RegistryBackedRegistryView<>(Block.REGISTRY); + ITEMS = new RegistryBackedRegistryView<>(Item.REGISTRY); + STATUS_EFFECTS = setupStatusEffectRegistry(); + ENCHANTMENTS = setupEnchantmentRegistry(); + ENTITY_TYPES = setupEntityTypesRegistry(); + } private static RegistryView> setupEntityTypesRegistry() { TableBackedRegistryView.Builder> registry = new TableBackedRegistryView.Builder<>(); @@ -68,14 +78,4 @@ public class Registries { } return builder.build(); } - - public static void init() { - LANGUAGE = new Language(); - BIOMES = setupBiomeRegistry(); - BLOCKS = new RegistryBackedRegistryView<>(Block.REGISTRY); - ITEMS = new RegistryBackedRegistryView<>(Item.REGISTRY); - STATUS_EFFECTS = setupStatusEffectRegistry(); - ENCHANTMENTS = setupEnchantmentRegistry(); - ENTITY_TYPES = setupEntityTypesRegistry(); - } } diff --git a/1.7/src/main/resources/fabric.mod.json b/1.7/src/main/resources/fabric.mod.json index 2e49539..ffac96b 100644 --- a/1.7/src/main/resources/fabric.mod.json +++ b/1.7/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.7" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.7/src/main/resources/minecraft-data-generator.mixins.json b/1.7/src/main/resources/minecraft-data-generator.mixins.json index 804329b..f4b1236 100644 --- a/1.7/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.7/src/main/resources/minecraft-data-generator.mixins.json @@ -4,7 +4,6 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "BlocksMixin", "ReadyMixin", "VariantBlockItemAccessor", "accessor.BiomeAccessor", @@ -17,8 +16,6 @@ "accessor.StatusEffectAccessor", "overwrite.ItemEntityOverwrite" ], - "client": [ - ], "injectors": { "defaultRequire": 1 } diff --git a/1.8.9/build.gradle b/1.8.9/build.gradle index 057916c..5b8c083 100644 --- a/1.8.9/build.gradle +++ b/1.8.9/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.8.9" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.8.9/gradle.properties b/1.8.9/gradle.properties deleted file mode 100644 index 7cbf4cd..0000000 --- a/1.8.9/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.8.9 -yarn_mappings=1.8.9+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index ee0d220..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeBlockColors.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.*; -import net.minecraft.client.color.world.BiomeColors; -import net.minecraft.client.color.world.FoliageColors; -import net.minecraft.util.math.BlockPos; - -import static net.minecraft.block.RedstoneWireBlock.POWER; - -public class BiomeBlockColors { - // generated manually from each Biome's Biome#getBlockColor - public static int getBlockColor(Block block, BlockState state) { - if (block instanceof AbstractFluidBlock) { - return BiomeColors.getWaterColor(EmptyBlockView.INSTANCE, BlockPos.ORIGIN); - } else if (block instanceof AttachedStemBlock) { - return getAttachedStemColor(state, block); - } else if (block instanceof DoublePlantBlock) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public BlockState getBlockState(BlockPos pos) { - return state; - } - }; - DoublePlantBlock.DoublePlantType doublePlantType = ((DoublePlantBlock) block).getVariant(bv, BlockPos.ORIGIN); - if (doublePlantType == DoublePlantBlock.DoublePlantType.GRASS || doublePlantType == DoublePlantBlock.DoublePlantType.FERN) { - return BiomeColors.getGrassColor(bv, BlockPos.ORIGIN); - } - } else if (block instanceof FlowerPotBlock) { - // FIXME: Yeah, flower pot block's color depends on the block inside of it, since we dont compute that, let's just not do anything -// Item item; -// BlockEntity blockEntity = view.getBlockEntity(pos); -// if (blockEntity instanceof FlowerPotBlockEntity && (item = ((FlowerPotBlockEntity)blockEntity).getItem()) instanceof BlockItem) { -// return Block.getBlockFromItem(item).getBlockColor(view, pos, id); -// } - } else if (block instanceof GrassBlock) { - return BiomeColors.getGrassColor(EmptyBlockView.INSTANCE, BlockPos.ORIGIN); - } else if (block instanceof Leaves1Block) { - return getLeaves1Color(state, block); - } else if (block instanceof LeavesBlock) { - return getLeavesColor(); - } else if (block instanceof RedstoneWireBlock) { - if (state.getBlock() == block) { - return ServerSideRedstoneWireBlock.getWireColor(state.get(POWER)); - } - } 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 0xFFFFFF; - } - - private static int getLeaves1Color(BlockState blockState, Block block) { - if (blockState.getBlock() == block) { - PlanksBlock.WoodType woodType = blockState.get(Leaves1Block.VARIANT); - if (woodType == PlanksBlock.WoodType.SPRUCE) { - return net.minecraft.client.color.world.FoliageColors.getSpruceColor(); - } - if (woodType == PlanksBlock.WoodType.BIRCH) { - return FoliageColors.getBirchColor(); - } - } - return getLeavesColor(); - } - - private static int getLeavesColor() { - return FoliageColors.getColor(0.5, 1.0); - } - - private static int getAttachedStemColor(BlockState state, Block block) { - if (state.getBlock() != block) { - return 0xFFFFFF; - } - int i = state.get(AttachedStemBlock.AGE); - int j = i * 32; - int k = 255 - i * 8; - int l = i * 4; - return j << 16 | k << 8 | l; - } -} 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 deleted file mode 100644 index fca5440..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,46 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.BlockView; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - 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) { - int i = 0; - int j = 0; - 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) { - BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next(); - l = provider.getColorAtPos(view.getBiome(mutable), mutable); - i += (l & 16711680) >> 16; - j += (l & '\uff00') >> 8; - } - - return (i / 9 & 255) << 16 | (j / 9 & 255) << 8 | k / 9 & 255; - } - - public static int getGrassColor(BlockView view, BlockPos pos) { - return getColor(view, pos, GRASS_COLOR); - } - - public static int getFoliageColor(BlockView view, BlockPos pos) { - return getColor(view, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(BlockView view, BlockPos pos) { - return getColor(view, pos, WATER_COLOR); - } - - interface ColorProvider { - int getColorAtPos(Biome biome, BlockPos pos); - } -} - 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 deleted file mode 100644 index 1a55df0..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,38 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 6396257; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - double d = MathHelper.clamp(biome.temperature, 0.0f, 1.0f); - double e = MathHelper.clamp(biome.downfall, 0.0f, 1.0f); - return FoliageColors.getColor(d, e); - } -} - 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 deleted file mode 100644 index ff015f9..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - int k = j << 8 | i; - return k > colorMap.length ? -65281 : colorMap[k]; - } - - public static int getGrassColor(Biome biome) { - double d = MathHelper.clamp(biome.temperature, 0.0f, 1.0f); - double e = MathHelper.clamp(biome.downfall, 0.0f, 1.0f); - return GrassColors.getColor(d, e); - } -} - - - 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 deleted file mode 100644 index 75c9f89..0000000 --- a/1.8.9/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.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index 675e449..24ce0d6 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.mixin.BiomeAccessor; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.world.biome.*; -import org.apache.commons.lang3.StringUtils; import java.util.Locale; @@ -20,91 +19,6 @@ public class BiomesDataGenerator implements IDataGenerator { return "overworld"; } - private static int getBiomeColorFor(String biomeDisplayNamed) { - if (biomeDisplayNamed.equals("Redwood Taiga Hills M")) { - biomeDisplayNamed = "MegaTaigaHills"; - } - String biomeDisplayName = StringUtils.join(biomeDisplayNamed.split(" "), ""); - return switch (biomeDisplayName) { - case "Ocean" -> 112; - case "Plains" -> 9286496; - case "Desert" -> 16421912; - case "ExtremeHills", "Extreme Hills" -> 6316128; - case "Forest" -> 353825; - case "Taiga" -> 747097; - case "Swampland" -> 522674; - case "River" -> 255; - case "Hell" -> 16711680; - case "TheEnd", "The End" -> 8421631; - case "FrozenOcean", "Frozen Ocean" -> 7368918; - case "FrozenRiver", "Frozen River" -> 10526975; - case "IcePlains", "Ice Plains" -> 16777215; - case "IceMountains", "Ice Mountains" -> 10526880; - case "MushroomIsland", "Mushroom Island" -> 16711935; - case "MushroomIslandShore", "Mushroom Island Shore" -> 10486015; - case "Beach" -> 16440917; - case "DesertHills", "Desert Hills" -> 13786898; - case "ForestHills", "Forest Hills" -> 2250012; - case "TaigaHills", "Taiga Hills" -> 1456435; - case "ExtremeHillsEdge", "Extreme Hills Edge" -> 7501978; - case "Jungle" -> 5470985; - case "JungleHills", "Jungle Hills" -> 2900485; - case "JungleEdge", "Jungle Edge" -> 6458135; - case "DeepOcean", "Deep Ocean" -> 48; - case "StoneBeach", "Stone Beach" -> 10658436; - case "ColdBeach", "Cold Beach" -> 16445632; - case "BirchForest", "Birch Forest" -> 3175492; - case "BirchForestHills", "Birch Forest Hills" -> 2055986; - case "RoofedForest", "Roofed Forest" -> 4215066; - case "ColdTaiga", "Cold Taiga" -> 3233098; - case "ColdTaigaHills", "Cold Taiga Hills" -> 2375478; - case "MegaTaiga", "Mega Taiga" -> 5858897; - case "MegaTaigaHills", "Mega Taiga Hills" -> 4542270; - case "ExtremeHills+", "Extreme Hills+" -> 5271632; - case "Savanna" -> 12431967; - case "SavannaPlateau", "Savanna Plateau" -> 10984804; - case "Mesa" -> 14238997; - case "MesaPlateauF", "Mesa Plateau F" -> 11573093; - case "MesaPlateau", "Mesa Plateau" -> 13274213; - case "TheEnd-Floatingislands", "The End - Floating islands" -> 8421631; - case "TheEnd-Mediumisland", "The End - Medium island" -> 8421631; - case "TheEnd-Highisland", "The End - High island" -> 8421631; - case "TheEnd-Barrenisland", "The End - Barren island" -> 8421631; - case "WarmOcean", "Warm Ocean" -> 172; - case "LukewarmOcean", "Lukewarm Ocean" -> 144; - case "ColdOcean", "Cold Ocean" -> 2105456; - case "WarmDeepOcean", "Warm Deep Ocean" -> 80; - case "LukewarmDeepOcean", "Lukewarm Deep Ocean" -> 64; - case "ColdDeepOcean", "Cold Deep Ocean" -> 2105400; - case "FrozenDeepOcean", "Frozen Deep Ocean" -> 4210832; - case "TheVoid", "The Void" -> 0; - case "SunflowerPlains", "Sunflower Plains" -> 11918216; - case "DesertM", "Desert M" -> 16759872; - case "ExtremeHillsM", "Extreme Hills M" -> 8947848; - case "FlowerForest", "Flower Forest" -> 2985545; - case "TaigaM", "Taiga M" -> 3378817; - case "SwamplandM", "Swampland M" -> 3145690; - case "IcePlainsSpikes", "Ice Plains Spikes" -> 11853020; - case "JungleM", "Jungle M" -> 8102705; - case "JungleEdgeM", "Jungle Edge M" -> 9089855; - case "BirchForestM", "Birch Forest M" -> 5807212; - case "BirchForestHillsM", "Birch Forest Hills M" -> 4687706; - case "RoofedForestM", "Roofed Forest M" -> 6846786; - case "ColdTaigaM", "Cold Taiga M" -> 5864818; - case "MegaSpruceTaiga", "Mega Spruce Taiga" -> 8490617; - case "MegaSpruceTaiga(Hills)", "Mega Spruce Taiga (Hills)" -> 7173990; - case "ExtremeHills+M", "Extreme Hills+ M" -> 7903352; - case "SavannaM", "Savanna M" -> 15063687; - case "SavannaPlateauM", "Savanna Plateau M" -> 13616524; - case "Mesa(Bryce)", "Mesa (Bryce)" -> 16739645; - case "MesaPlateauFM", "Mesa Plateau F M" -> 14204813; - case "MesaPlateauM", "Mesa Plateau M" -> 15905933; - case "BambooJungle", "Bamboo Jungle" -> 7769620; - case "BambooJungleHills", "Bamboo Jungle Hills" -> 3884810; - default -> throw new Error("Unexpected biome, with name: '" + biomeDisplayName + "'"); - }; - } - public static JsonObject generateBiomeInfo(Biome biome) { JsonObject biomeDesc = new JsonObject(); // Identifier registryKey = registry.getIdentifier(biome); @@ -117,7 +31,7 @@ public class BiomesDataGenerator implements IDataGenerator { biomeDesc.addProperty("depth", biome.depth); biomeDesc.addProperty("dimension", guessBiomeDimensionFromCategory(biome)); biomeDesc.addProperty("displayName", ((BiomeAccessor) biome).name()); - biomeDesc.addProperty("color", getBiomeColorFor(((BiomeAccessor) biome).name())); + biomeDesc.addProperty("color", biome.getSkyColor(biome.temperature)); biomeDesc.addProperty("rainfall", biome.downfall); return biomeDesc; 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 38ec86b..411a466 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 @@ -79,7 +79,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } } if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { - return indexesOfBoxesInTheShapesCache.get(0); + return indexesOfBoxesInTheShapesCache.getFirst(); } else { JsonArray shapeIndexes = new JsonArray(); indexesOfBoxesInTheShapesCache.forEach(shapeIndex -> shapeIndexes.add(new JsonPrimitive(shapeIndex))); @@ -99,18 +99,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5431a48..1262f5f 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -4,7 +4,6 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -27,12 +26,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { 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 deleted file mode 100644 index 249c630..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,80 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 08524dc..3dc768f 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -15,7 +15,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(Registries.STATUS_EFFECTS.getIdentifier(statusEffect)); 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 e0e9e74..a14483d 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 @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = Registries.ENTITY_TYPES.getIdentifier(entityClass); diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index fd68583..f2ad50b 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = Registries.ITEMS.getIdentifier(foodItem); diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 2b1a508..36025a4 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import net.minecraft.client.particle.ParticleType; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(int id, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..553fbdf 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,11 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); 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 4412712..cddf868 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,36 +3,30 @@ 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.mixin.BiomeAccessor; -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; +import java.lang.reflect.Method; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public Biome getBiome(BlockPos pos) { - return biome; - } - }; - int biomeGrassColor = GrassColors.getGrassColor(bv.getBiome(BlockPos.ORIGIN)); - int biomeFoliageColor = FoliageColors.getFoliageColor(bv.getBiome(BlockPos.ORIGIN)); + double d = MathHelper.clamp(biome.temperature, 0.0F, 1.0F); + double e = MathHelper.clamp(biome.downfall, 0.0F, 1.0F); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -43,33 +37,37 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); - for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); - resultColors.put(redstoneLevel, color); + RedstoneWireBlock redstoneWireBlock = new RedstoneWireBlock(); + try { + Method colorIntensity = RedstoneWireBlock.class.getDeclaredMethod("getColorIntensity", int.class); + colorIntensity.setAccessible(true); + for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { + int color = (int) colorIntensity.invoke(redstoneWireBlock, redstoneLevel); + resultColors.put(redstoneLevel, color); + } + } catch (ReflectiveOperationException e) { + throw new RuntimeException(e); } + return resultColors; } - private static int getBlockColor(Block block) { - return BiomeBlockColors.getBlockColor(block, block.getDefaultState()); - } - public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.LILY_PAD, Blocks.LILY_PAD.getColor()); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); + resultColors.put(Blocks.MELON_STEM, Blocks.MELON_STEM.getColor()); + resultColors.put(Blocks.PUMPKIN_STEM, Blocks.PUMPKIN_STEM.getColor()); return resultColors; } @@ -154,8 +152,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } 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 deleted file mode 100644 index 5158ecd..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/CocoaBlockOverwrite.java +++ /dev/null @@ -1,43 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin.overwrite; - -import net.minecraft.block.BlockState; -import net.minecraft.block.CocoaBlock; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -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); - int j = 4 + i * 2; - int k = 5 + i * 2; - float f = (float) j / 2.0f; - return switch (direction) { - case SOUTH -> - new Box((8.0f - f) / 16.0f, (12.0f - (float) k) / 16.0f, (15.0f - (float) j) / 16.0f, (8.0f + f) / 16.0f, 0.75f, 0.9375f); - case NORTH -> - new Box((8.0f - f) / 16.0f, (12.0f - (float) k) / 16.0f, 0.0625f, (8.0f + f) / 16.0f, 0.75f, (1.0f + (float) j) / 16.0f); - case WEST -> - new Box(0.0625f, (12.0f - (float) k) / 16.0f, (8.0f - f) / 16.0f, (1.0f + (float) j) / 16.0f, 0.75f, (8.0f + f) / 16.0f); - case EAST -> - new Box((15.0f - (float) j) / 16.0f, (12.0f - (float) k) / 16.0f, (8.0f - f) / 16.0f, 0.9375f, 0.75f, (8.0f + f) / 16.0f); - default -> throw new Error("Should never hit here"); - }; - } - - /** - * @author a - * @reason a - */ - @Overwrite - public Box getCollisionBox(World world, BlockPos pos, BlockState state) { - return collisionBox(state); - } -} diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/EndPortalFrameBlockOverwrite.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/EndPortalFrameBlockOverwrite.java deleted file mode 100644 index f4ac01b..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/EndPortalFrameBlockOverwrite.java +++ /dev/null @@ -1,34 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin.overwrite; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.EndPortalFrameBlock; -import net.minecraft.block.Material; -import net.minecraft.entity.Entity; -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.Overwrite; - -import java.util.List; - -@Mixin(EndPortalFrameBlock.class) -public class EndPortalFrameBlockOverwrite extends Block { - protected EndPortalFrameBlockOverwrite(Material material) { - super(material); - } - - /** - * @author a - * @reason a - */ - @Overwrite() - public void appendCollisionBoxes(World world, BlockPos pos, BlockState state, Box box, List list, Entity entity) { - this.setBoundingBox(0.0F, 0.0F, 0.0F, 1.0F, 0.8125F, 1.0F); - super.appendCollisionBoxes(world, pos, state, box, list, entity); - this.setBoundingBox(0.3125F, 0.8125F, 0.3125F, 0.6875F, 1.0F, 0.6875F); - super.appendCollisionBoxes(world, pos, state, box, list, entity); - this.setBlockItemBounds(); - } -} diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java deleted file mode 100644 index e2f9a19..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/ItemEntityOverwrite.java +++ /dev/null @@ -1,24 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin.overwrite; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.ItemEntity; -import net.minecraft.world.World; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -@Mixin(ItemEntity.class) -public abstract class ItemEntityOverwrite extends Entity { - - public ItemEntityOverwrite(World world) { - super(world); - } - - /** - * @author a - * @reason a - */ - @Overwrite - public String getTranslationKey() { - return super.getTranslationKey(); - } -} 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 deleted file mode 100644 index c0e7633..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/SkeletonSkullBlockOverwrite.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin.overwrite; - -import net.minecraft.block.BlockState; -import net.minecraft.block.SkeletonSkullBlock; -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); - case NORTH -> new Box(0.25f, 0.25f, 0.5f, 0.75f, 0.75f, 1.0f); - case SOUTH -> new Box(0.25f, 0.25f, 0.0f, 0.75f, 0.75f, 0.5f); - case WEST -> new Box(0.5f, 0.25f, 0.25f, 1.0f, 0.75f, 0.75f); - case EAST -> new Box(0.0f, 0.25f, 0.25f, 0.5f, 0.75f, 0.75f); - }; - } - - @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 deleted file mode 100644 index 2da7786..0000000 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/mixin/overwrite/StairBlockOverwrite.java +++ /dev/null @@ -1,153 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin.overwrite; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Material; -import net.minecraft.block.StairsBlock; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; -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; - -import static net.minecraft.block.StairsBlock.HALF; - -@Mixin(StairsBlock.class) -public abstract class StairBlockOverwrite extends Block { - protected StairBlockOverwrite(Material material) { - super(material); - } - - @Shadow - public abstract void setBoundingBox(BlockView view, BlockPos pos); - - @Shadow - public abstract boolean method_8911(BlockView blockView, BlockPos blockPos); - - /** - * @author a - * @reason a - */ - @Overwrite - public void appendCollisionBoxes(World world, BlockPos pos, BlockState state, Box box, List list, Entity entity) { - list.add(someFuncThatIRemade(state)); - super.appendCollisionBoxes(world, pos, state, box, list, entity); - EmptyBlockView bv = new EmptyBlockView() { - @Override - public BlockState getBlockState(BlockPos pos) { - return state; - } - }; - boolean bl = this.method_8911(bv, pos); - list.add(this.getCollisionBox(world, pos, state)); - if (bl && calculateWhichTypeOfStairThisIsButDoesntWorkBecauseWeDontHaveAdjBlocks(state)) { - list.add(this.getCollisionBox(world, pos, state)); - } - 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); - } else { - return new Box(0.0f, 0.0f, 0.0f, 1.0f, 0.5f, 1.0f); - } - } - - @Unique - public boolean calculateWhichTypeOfStairThisIsButDoesntWorkBecauseWeDontHaveAdjBlocks(BlockState state) { - EmptyBlockView blockView = new EmptyBlockView() { - @Override - public BlockState getBlockState(BlockPos pos) { - return state; - } - }; - BlockState blockState2; - Block block; - BlockState blockState = blockView.getBlockState(BlockPos.ORIGIN); - Direction direction = blockState.get(StairsBlock.FACING); - StairsBlock.Half half = blockState.get(HALF); - boolean bl = half == StairsBlock.Half.TOP; - float f = 0.5f; - float g = 1.0f; - if (bl) { - f = 0.0f; - g = 0.5f; - } - float h = 0.0f; - float i = 0.5f; - float j = 0.5f; - float k = 1.0f; - boolean bl2 = false; - if (direction == Direction.EAST) { - BlockState blockState22 = blockView.getBlockState(BlockPos.ORIGIN); - Block block2 = blockState22.getBlock(); - if (StairsBlock.method_6513(block2) && half == blockState22.get(HALF)) { - Direction direction2 = blockState22.get(StairsBlock.FACING); - if (direction2 == Direction.NORTH && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - j = 0.0f; - k = 0.5f; - bl2 = true; - } else if (direction2 == Direction.SOUTH && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - j = 0.5f; - k = 1.0f; - bl2 = true; - } - } - } else if (direction == Direction.WEST) { - BlockState blockState23 = blockView.getBlockState(BlockPos.ORIGIN); - Block block3 = blockState23.getBlock(); - if (StairsBlock.method_6513(block3) && half == blockState23.get(HALF)) { - h = 0.5f; - i = 1.0f; - Direction direction2 = blockState23.get(StairsBlock.FACING); - if (direction2 == Direction.NORTH && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - j = 0.0f; - k = 0.5f; - bl2 = true; - } else if (direction2 == Direction.SOUTH && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - j = 0.5f; - k = 1.0f; - bl2 = true; - } - } - } else if (direction == Direction.SOUTH) { - BlockState blockState24 = blockView.getBlockState(BlockPos.ORIGIN); - Block block4 = blockState24.getBlock(); - if (StairsBlock.method_6513(block4) && half == blockState24.get(HALF)) { - j = 0.0f; - k = 0.5f; - Direction direction2 = blockState24.get(StairsBlock.FACING); - if (direction2 == Direction.WEST && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - bl2 = true; - } else if (direction2 == Direction.EAST && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - h = 0.5f; - i = 1.0f; - bl2 = true; - } - } - } else if (direction == Direction.NORTH && StairsBlock.method_6513(block = (blockState2 = blockView.getBlockState(BlockPos.ORIGIN)).getBlock()) && half == blockState2.get(HALF)) { - Direction direction2 = blockState2.get(StairsBlock.FACING); - if (direction2 == Direction.WEST && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - bl2 = true; - } else if (direction2 == Direction.EAST && !StairsBlock.method_8907(blockView, BlockPos.ORIGIN, blockState)) { - h = 0.5f; - i = 1.0f; - bl2 = true; - } - } - if (bl2) { - this.setBoundingBox(h, f, j, i, g, k); - } - return bl2; - } -} diff --git a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 5f77e52..eff7886 100644 --- a/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.8.9/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,9 +1,5 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; @@ -12,28 +8,11 @@ import org.jetbrains.annotations.NotNull; public class DGU { public static MinecraftServer getCurrentlyRunningServer() { - return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); + return MinecraftServer.getServer(); } public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.8.9/src/main/resources/fabric.mod.json b/1.8.9/src/main/resources/fabric.mod.json index 96b7e40..ffac96b 100644 --- a/1.8.9/src/main/resources/fabric.mod.json +++ b/1.8.9/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.8.9" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.8.9/src/main/resources/minecraft-data-generator.mixins.json b/1.8.9/src/main/resources/minecraft-data-generator.mixins.json index 9038926..7bb0449 100644 --- a/1.8.9/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.8.9/src/main/resources/minecraft-data-generator.mixins.json @@ -12,14 +12,7 @@ "MiningToolItemAccessor", "NoteBlockAccessor", "ReadyMixin", - "StatusEffectAccessor", - "overwrite.CocoaBlockOverwrite", - "overwrite.EndPortalFrameBlockOverwrite", - "overwrite.ItemEntityOverwrite", - "overwrite.SkeletonSkullBlockOverwrite", - "overwrite.StairBlockOverwrite" - ], - "client": [ + "StatusEffectAccessor" ], "injectors": { "defaultRequire": 1 diff --git a/1.9.4/build.gradle b/1.9.4/build.gradle index 057916c..7846c5e 100644 --- a/1.9.4/build.gradle +++ b/1.9.4/build.gradle @@ -1,47 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' } -repositories { - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" +unimined.minecraft { + version "1.9.4" + + mappings { + legacyIntermediary() + legacyYarn(541) + + devFallbackNamespace "intermediary" } -} -loom { - setIntermediaryUrl('https://maven.legacyfabric.net/net/fabricmc/intermediary/%1$s/intermediary-%1$s-v2.jar'); - customMinecraftManifest.set("https://meta.legacyfabric.net/v2/manifest/${minecraft_version}") + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomLegacyFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API provides hooks for events, item registration, and more. As most mods will need this, it's included by default. - // If you know for a fact you don't, it's not required and can be safely removed. -// modImplementation ("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:${fabric_version}") { -// exclude module: "legacy-fabric-entity-events-v1" -// } - - if (System.getProperty("os.name").toLowerCase().contains("mac")) { - implementation 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209' - implementation 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } -} - -if (System.getProperty("os.name").toLowerCase().contains("mac")) { - configurations.configureEach { - resolutionStrategy { - dependencySubstitution { - substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209') - substitute module('org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-201408222') with module('org.lwjgl.lwjgl:lwjgl:2.9.4-nightly-20150209') - } - force 'org.lwjgl.lwjgl:lwjgl-platform:2.9.4-nightly-20150209' - } - } + implementation project(":common") } processResources { @@ -52,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/1.9.4/gradle.properties b/1.9.4/gradle.properties deleted file mode 100644 index fc6b90d..0000000 --- a/1.9.4/gradle.properties +++ /dev/null @@ -1,7 +0,0 @@ -# Fabric Properties -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ -minecraft_version=1.9.4 -yarn_mappings=1.9.4+build.202206020145 -loader_version=0.14.3 -# Dependencies -# More versions available at: https://grayray75.github.io/LegacyFabric-Versions/ diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index d23c5ba..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; - -import java.util.logging.Logger; - -public class Main implements ModInitializer { - public static final Logger LOGGER = Logger.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - } -} 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 deleted file mode 100644 index f42641f..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BiomeColors.java +++ /dev/null @@ -1,47 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.Biome; - -import java.util.Iterator; - -public class BiomeColors { - 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) { - int i = 0; - int j = 0; - 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) { - BlockPos.Mutable mutable = (BlockPos.Mutable) iterator.next(); - l = provider.getColorAtPos(view.getBiome(mutable), mutable); - i += (l & 16711680) >> 16; - j += (l & '\uff00') >> 8; - } - - return (i / 9 & 255) << 16 | (j / 9 & 255) << 8 | k / 9 & 255; - } - - public static int getGrassColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, GRASS_COLOR); - } - - public static int getFoliageColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, FOLIAGE_COLOR); - } - - public static int getWaterColor(EmptyBlockView view, BlockPos pos) { - return getColor(view, pos, WATER_COLOR); - } - - interface ColorProvider { - int getColorAtPos(Biome biome, BlockPos pos); - } -} - - diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java deleted file mode 100644 index b681922..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColorable.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public interface BlockColorable { - int method_12155(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i); -} 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 deleted file mode 100644 index 2bd090c..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/BlockColors.java +++ /dev/null @@ -1,96 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; -import net.minecraft.block.*; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.FlowerPotBlockEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.util.collection.IdList; -import net.minecraft.util.math.BlockPos; -import org.jetbrains.annotations.Nullable; - -public class BlockColors { - private final IdList BlockColor2Id = new IdList<>(32); - - public BlockColors() { - } - - public static BlockColors create() { - final BlockColors blockColors = new BlockColors(); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - 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) -> { - if (blockView != null && blockPos != null) { - BlockEntity blockEntity = blockView.getBlockEntity(blockPos); - if (blockEntity instanceof FlowerPotBlockEntity) { - Item item = ((FlowerPotBlockEntity) blockEntity).getItem(); - if (item instanceof BlockItem) { - BlockState blockState2 = Block.getBlockFromItem(item).getDefaultState(); - return blockColors.method_12157(blockState2, blockView, blockPos, i); - } - } - } - - return -1; - }, 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 = blockState.get(Leaves1Block.VARIANT); - if (woodType == PlanksBlock.WoodType.SPRUCE) { - return FoliageColors.getSpruceColor(); - } else if (woodType == PlanksBlock.WoodType.BIRCH) { - return FoliageColors.getBirchColor(); - } else { - return blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(); - } - }, 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(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); - int k = j * 32; - int l = 255 - j * 8; - int m = j * 4; - return k << 16 | l << 8 | m; - }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM); - blockColors.method_12158((blockState, blockView, blockPos, i) -> { - if (blockView != null && blockPos != null) { - return BiomeColors.getGrassColor(blockView, blockPos); - } else { - return blockState.get(TallPlantBlock.TYPE) == TallPlantBlock.GrassType.DEAD_BUSH ? 16777215 : GrassColors.getColor(0.5D, 1.0D); - } - }, Blocks.TALLGRASS); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? BiomeColors.getFoliageColor(blockView, blockPos) : FoliageColors.getDefaultColor(), Blocks.VINE); - blockColors.method_12158((blockState, blockView, blockPos, i) -> blockView != null && blockPos != null ? 2129968 : 7455580, Blocks.LILY_PAD); - return blockColors; - } - - public int method_13410(BlockState blockState) { - BlockColorable blockColorable = this.BlockColor2Id.fromId(Block.getIdByBlock(blockState.getBlock())); - if (blockColorable != null) { - return blockColorable.method_12155(blockState, null, null, 0); - } else { - MaterialColor materialColor = blockState.getMaterialColor(); - return materialColor != null ? materialColor.color : -1; - } - } - - public int method_12157(BlockState blockState, @Nullable EmptyBlockView blockView, @Nullable BlockPos blockPos, int i) { - 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 (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.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java deleted file mode 100644 index b63e543..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/FoliageColors.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class FoliageColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] pixels) { - colorMap = pixels; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - return colorMap[j << 8 | i]; - } - - public static int getSpruceColor() { - return 6396257; - } - - public static int getBirchColor() { - return 8431445; - } - - public static int getDefaultColor() { - return 4764952; - } - - public static int getFoliageColor(Biome biome) { - 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 deleted file mode 100644 index afee2b7..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/clientsideannoyances/GrassColors.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.u9g.minecraftdatagenerator.clientsideannoyances; - -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.biome.Biome; - -public class GrassColors { - private static int[] colorMap = new int[65536]; - - public static void setColorMap(int[] map) { - colorMap = map; - } - - public static int getColor(double temperature, double humidity) { - humidity *= temperature; - int i = (int) ((1.0D - temperature) * 255.0D); - int j = (int) ((1.0D - humidity) * 255.0D); - int k = j << 8 | i; - return k > colorMap.length ? -65281 : colorMap[k]; - } - - public static int getGrassColor(Biome biome) { - 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 deleted file mode 100644 index 75c9f89..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/generators/BlockCollisionShapesDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 2bb5a0b..02fd69a 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 @@ -79,7 +79,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } } if (indexesOfBoxesInTheShapesCache.stream().distinct().count() < 2) { - return indexesOfBoxesInTheShapesCache.get(0); + return indexesOfBoxesInTheShapesCache.getFirst(); } else { JsonArray shapeIndexes = new JsonArray(); indexesOfBoxesInTheShapesCache.forEach(shapeIndex -> shapeIndexes.add(new JsonPrimitive(shapeIndex))); @@ -99,18 +99,18 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { 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); + } } } diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index dbea9f6..f61dc62 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -4,7 +4,6 @@ import com.google.common.base.CaseFormat; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import dev.u9g.minecraftdatagenerator.Main; import dev.u9g.minecraftdatagenerator.mixin.BlockAccessor; import dev.u9g.minecraftdatagenerator.mixin.MiningToolItemAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; @@ -28,12 +27,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; -import java.util.logging.Logger; public class BlocksDataGenerator implements IDataGenerator { - - private static final Logger logger = Main.LOGGER; - private static List getItemsEffectiveForBlock(Block block) { List items = new ArrayList<>(); for (Item item : Registries.ITEMS) { 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 deleted file mode 100644 index c89d077..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import dev.u9g.minecraftdatagenerator.Main; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class DataGenerators { - - private static final List GENERATORS = new ArrayList<>(); - private static final Logger logger = Main.LOGGER; - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new AttributesDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.info("Failed to create data generator output directory at " + outputDirectory); - exception.printStackTrace(); - return false; - } - - int generatorsFailed = 0; - logger.info(MessageFormat.format("Running minecraft data generators, output at {0}", outputDirectory)); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info(MessageFormat.format("Running generator {0}", dataGenerator.getDataName())); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info(MessageFormat.format("Generator: {0} -> {1}", dataGenerator.getDataName(), outputFileName)); - - } catch (Throwable exception) { - logger.info(MessageFormat.format("Failed to run data generator {0}", dataGenerator.getDataName())); - exception.printStackTrace(); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 6aba51e..ea880e4 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); @NotNull Identifier registryKey = Objects.requireNonNull(Registries.STATUS_EFFECTS.getIdentifier(statusEffect)); 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 d5ef72e..2554af4 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 @@ -21,7 +21,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Class entityClass) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = Registries.ENTITY_TYPES.getIdentifier(entityClass); diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index fd68583..f2ad50b 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.Identifier; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(FoodItem foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = Registries.ITEMS.getIdentifier(foodItem); diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java index 3aa51c4..dcb6c5b 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/InstrumentsDataGenerator.java @@ -4,8 +4,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.mixin.NoteBlockAccessor; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import java.util.Objects; @@ -19,10 +18,10 @@ public class InstrumentsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { JsonArray array = new JsonArray(); int i = 0; - for (SoundEvent sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { + for (Sound sound : Objects.requireNonNull(NoteBlockAccessor.TUNES())) { JsonObject object = new JsonObject(); object.addProperty("id", i++); - object.addProperty("name", ((SoundAccessor) sound).id().getPath().split("\\.")[2]); + object.addProperty("name", sound.getId().getPath().split("\\.")[2]); array.add(object); } return array; diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 2b1a508..36025a4 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -5,7 +5,6 @@ import com.google.gson.JsonObject; import net.minecraft.client.particle.ParticleType; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(int id, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 32498df..553fbdf 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -112,6 +112,11 @@ public class RecipeDataGenerator implements IDataGenerator { // return finalObj; return JsonNull.INSTANCE; } + + @Override + public boolean isEnabled() { + return false; // TODO: Implement this + } // // private static int getRawIdFor (Item item) { // return Registry.ITEM.getRawId(item); diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 9429a29..88e0e8a 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -2,17 +2,14 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.SoundAccessor; -import net.minecraft.client.sound.SoundEvent; - +import net.minecraft.sound.Sound; public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(SoundEvent soundEvent) { + public static JsonObject generateSound(Sound soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", SoundEvent.REGISTRY.getRawId(soundEvent)); - soundDesc.addProperty("name", ((SoundAccessor) soundEvent).id().getPath()); + soundDesc.addProperty("id", Sound.REGISTRY.getRawId(soundEvent)); + soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; } @@ -25,7 +22,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - SoundEvent.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); + Sound.REGISTRY.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } 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 8d1b2a8..1e19312 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,38 +3,32 @@ 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.mixin.BiomeAccessor; -import dev.u9g.minecraftdatagenerator.util.EmptyBlockView; +import dev.u9g.minecraftdatagenerator.util.DGU; import dev.u9g.minecraftdatagenerator.util.Registries; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.RedstoneWireBlock; +import net.minecraft.client.BlockColors; +import net.minecraft.client.color.world.FoliageColors; +import net.minecraft.client.color.world.GrassColors; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - - private static final BlockColors blockColors = BlockColors.create(); - public static BiomeTintColors generateBiomeTintColors() { BiomeTintColors colors = new BiomeTintColors(); for (Biome biome : Registries.BIOMES) { - EmptyBlockView bv = new EmptyBlockView() { - @Override - public Biome getBiome(BlockPos pos) { - return biome; - } - }; - int biomeGrassColor = GrassColors.getGrassColor(bv.getBiome(BlockPos.ORIGIN)); - int biomeFoliageColor = FoliageColors.getFoliageColor(bv.getBiome(BlockPos.ORIGIN)); + double d = MathHelper.clamp(biome.getTemperature(), 0.0f, 1.0f); + double e = MathHelper.clamp(biome.getRainfall(), 0.0f, 1.0f); + + int biomeGrassColor = GrassColors.getColor(d, e); + int biomeFoliageColor = FoliageColors.getColor(d, e); int biomeWaterColor = ((BiomeAccessor) biome).waterColor(); colors.grassColoursMap.computeIfAbsent(biomeGrassColor, k -> new ArrayList<>()).add(biome); @@ -45,30 +39,29 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { - int color = ServerSideRedstoneWireBlock.getWireColor(redstoneLevel); + int color = RedstoneWireBlock.getColorIntensity(redstoneLevel); resultColors.put(redstoneLevel, color); } return resultColors; } private static int getBlockColor(Block block) { - return blockColors.method_13410(block.getDefaultState()); + return BlockColors.create().method_12157(block.getDefaultState(), DGU.getWorld(), BlockPos.ORIGIN, 0); } public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); // FIXME: ? // resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); // resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); // FIXME: ? - // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + // resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + // resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); @@ -158,8 +151,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java index 4bc3bcb..688aa1c 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/NoteBlockAccessor.java @@ -1,7 +1,7 @@ package dev.u9g.minecraftdatagenerator.mixin; import net.minecraft.block.NoteBlock; -import net.minecraft.client.sound.SoundEvent; +import net.minecraft.sound.Sound; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -10,7 +10,7 @@ import java.util.List; @Mixin(NoteBlock.class) public interface NoteBlockAccessor { @Accessor("TUNES") - static List TUNES() { + static List TUNES() { return null; } } 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 f5608f0..c1d9658 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 @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.server.dedicated.MinecraftDedicatedServer; import org.spongepowered.asm.mixin.Mixin; @@ -9,19 +8,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; -import java.util.logging.Level; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - 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.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + DGU.getCurrentlyRunningServer().getVersion(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java deleted file mode 100644 index fe50591..0000000 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/mixin/SoundAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.minecraft.client.sound.SoundEvent; -import net.minecraft.util.Identifier; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(SoundEvent.class) -public interface SoundAccessor { - @Accessor("id") - Identifier id(); -} diff --git a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 8edd9a2..95094ee 100644 --- a/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/1.9.4/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,75 +1,20 @@ package dev.u9g.minecraftdatagenerator.util; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.internal.bind.TypeAdapters; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; -import java.io.IOException; - public class DGU { - -// @Environment(EnvType.CLIENT) -// private static MinecraftServer getCurrentlyRunningServerClient() { -// return MinecraftClient.getInstance().getServer(); -// } -// -// @SuppressWarnings("deprecation") -// private static MinecraftServer getCurrentlyRunningServerDedicated() { -// return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); -// } - - public static Gson gson = new GsonBuilder().registerTypeAdapterFactory(TypeAdapters.newFactory(double.class, Double.class, new TypeAdapter() { - @Override - public Number read(JsonReader in) throws IOException { - if (in.peek() == JsonToken.NULL) { - in.nextNull(); - return null; - } - return in.nextDouble(); - } - - @Override - public void write(JsonWriter out, Number value) throws IOException { - out.value(value); - } - })).create(); - + @SuppressWarnings("deprecation") public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return Registries.LANGUAGE.translate(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Registries.LANGUAGE.translate(translationKey); } @NotNull diff --git a/1.9.4/src/main/resources/fabric.mod.json b/1.9.4/src/main/resources/fabric.mod.json index ad1562f..ffac96b 100644 --- a/1.9.4/src/main/resources/fabric.mod.json +++ b/1.9.4/src/main/resources/fabric.mod.json @@ -10,17 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.13.3", - "minecraft": ">=1.9" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/1.9.4/src/main/resources/minecraft-data-generator.mixins.json b/1.9.4/src/main/resources/minecraft-data-generator.mixins.json index 4dd1315..3ed8234 100644 --- a/1.9.4/src/main/resources/minecraft-data-generator.mixins.json +++ b/1.9.4/src/main/resources/minecraft-data-generator.mixins.json @@ -14,11 +14,8 @@ "MiningToolItemAccessor", "NoteBlockAccessor", "ReadyMixin", - "SoundAccessor", "StatusEffectAccessor" ], - "client": [ - ], "injectors": { "defaultRequire": 1 }, diff --git a/22w19a/build.gradle b/22w19a/build.gradle index e85de39..c9d0588 100644 --- a/22w19a/build.gradle +++ b/22w19a/build.gradle @@ -1,15 +1,33 @@ +import xyz.wagyourtail.unimined.api.minecraft.task.RemapJarTask +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider + plugins { - id 'fabric-loom' + id 'xyz.wagyourtail.unimined' +} + +unimined.minecraft { + version "22w19a" + + mappings { + intermediary() + yarn(6) + + devFallbackNamespace "intermediary" + } + + runs.config("server") { + javaVersion = JavaVersion.VERSION_21 + } + + customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { + it.loader libs.versions.fabric.loader.get() + } + + defaultRemapJar = true } dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + implementation project(":common") } processResources { @@ -20,12 +38,10 @@ processResources { } } +tasks.withType(RemapJarTask).configureEach { + onlyIf { false} +} + tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" } - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) - } -} diff --git a/22w19a/gradle.properties b/22w19a/gradle.properties deleted file mode 100644 index d6cfd05..0000000 --- a/22w19a/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=22w19a -yarn_mappings=22w19a+build.1 -loader_version=0.14.5 -# Dependencies -# check this on https://modmuss50.me/fabric.html -fabric_version=0.52.2+1.19 diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/Main.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/Main.java deleted file mode 100644 index f8d1737..0000000 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.u9g.minecraftdatagenerator; - -import net.fabricmc.api.ModInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Main implements ModInitializer { - public static final Logger LOGGER = LoggerFactory.getLogger("mc-data-gen-serv"); - - @Override - public void onInitialize() { - - } -} diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java index 1d36549..0dca8c4 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java @@ -2,42 +2,42 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import dev.u9g.minecraftdatagenerator.mixin.TheEndBiomeDataAccessor; import dev.u9g.minecraftdatagenerator.util.DGU; -import net.fabricmc.fabric.api.biome.v1.NetherBiomes; +import net.minecraft.tag.BiomeTags; import net.minecraft.util.Identifier; +import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; public class BiomesDataGenerator implements IDataGenerator { - - private static String guessBiomeDimensionFromCategory(Biome biome) { - // FIND A WAY TO FIND WHAT CATEGORY THE BIOME IS - var key = DynamicRegistryManager.BUILTIN.get().get(Registry.BIOME_KEY).getKey(biome).orElseThrow(); - System.out.println(DynamicRegistryManager.BUILTIN.get().get(Registry.BIOME_KEY).getKey(biome).orElseThrow()); - if (NetherBiomes.canGenerateInNether(key)) { + private static String guessBiomeDimensionFromCategory(RegistryKey biome) { + var biomeRegistry = BuiltinRegistries.BIOME; + if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_NETHER)) { return "nether"; - } else if (TheEndBiomeDataAccessor.END_BARRENS_MAP().containsKey(key) || TheEndBiomeDataAccessor.END_BIOMES_MAP().containsKey(key) || TheEndBiomeDataAccessor.END_MIDLANDS_MAP().containsKey(key)) { + } else if (biomeRegistry.getEntry(biome).orElseThrow().isIn(BiomeTags.IS_END)) { return "end"; + } else { + return "overworld"; } - return "overworld"; } public static JsonObject generateBiomeInfo(Registry registry, Biome biome) { JsonObject biomeDesc = new JsonObject(); - Identifier registryKey = registry.getKey(biome).orElseThrow().getValue(); - String localizationKey = String.format("biome.%s.%s", registryKey.getNamespace(), registryKey.getPath()); + RegistryKey registryKey = registry.getKey(biome).orElseThrow(); + Identifier identifier = registryKey.getValue(); + String localizationKey = String.format("biome.%s.%s", identifier.getNamespace(), identifier.getPath()); biomeDesc.addProperty("id", registry.getRawId(biome)); - biomeDesc.addProperty("name", registryKey.getPath()); + biomeDesc.addProperty("name", identifier.getPath()); //FIXME: this... biomeDesc.addProperty("category", ""); biomeDesc.addProperty("temperature", biome.getTemperature()); biomeDesc.addProperty("precipitation", biome.getPrecipitation().getName()); //biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source - biomeDesc.addProperty("dimension", guessBiomeDimensionFromCategory(biome)); + biomeDesc.addProperty("dimension", guessBiomeDimensionFromCategory(registryKey)); biomeDesc.addProperty("displayName", DGU.translateText(localizationKey)); biomeDesc.addProperty("color", biome.getSkyColor()); biomeDesc.addProperty("rainfall", biome.getDownfall()); diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java index 52c3181..61e1b9e 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlockCollisionShapesDataGenerator.java @@ -12,10 +12,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.EmptyBlockView; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class BlockCollisionShapesDataGenerator implements IDataGenerator { @@ -40,8 +37,8 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { } private static class BlockShapesCache { - public final Map uniqueBlockShapes = new HashMap<>(); - public final Map> blockCollisionShapes = new HashMap<>(); + public final Map uniqueBlockShapes = new LinkedHashMap<>(); + public final Map> blockCollisionShapes = new LinkedHashMap<>(); private int lastCollisionShapeId = 0; public void processBlock(Block block) { @@ -70,7 +67,7 @@ public class BlockCollisionShapesDataGenerator implements IDataGenerator { long distinctShapesCount = blockCollisions.stream().distinct().count(); JsonElement blockCollision; if (distinctShapesCount == 1L) { - blockCollision = new JsonPrimitive(blockCollisions.get(0)); + blockCollision = new JsonPrimitive(blockCollisions.getFirst()); } else { blockCollision = new JsonArray(); for (int collisionId : blockCollisions) { diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index 5113965..121e6c5 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -105,7 +105,7 @@ public class BlocksDataGenerator implements IDataGenerator { .collect(Collectors.toList()); if (matchingMaterials.size() > 1) { - var firstMaterial = matchingMaterials.get(0); + var firstMaterial = matchingMaterials.getFirst(); var otherMaterials = matchingMaterials.subList(1, matchingMaterials.size()); if (!otherMaterials.stream().allMatch(firstMaterial::includesMaterial)) { @@ -115,19 +115,19 @@ public class BlocksDataGenerator implements IDataGenerator { if (matchingMaterials.isEmpty()) { return "default"; } - return matchingMaterials.get(0).getMaterialName(); + return matchingMaterials.getFirst().getMaterialName(); } - public static JsonObject generateBlock(Registry blockRegistry, List materials, Block block) { + public static JsonObject generateBlock(List materials, Block block) { JsonObject blockDesc = new JsonObject(); List blockStates = block.getStateManager().getStates(); BlockState defaultState = block.getDefaultState(); - Identifier registryKey = blockRegistry.getKey(block).orElseThrow().getValue(); + Identifier registryKey = Registry.BLOCK.getKey(block).orElseThrow().getValue(); String localizationKey = block.getTranslationKey(); List effectiveTools = getItemsEffectiveForBlock(defaultState); - blockDesc.addProperty("id", blockRegistry.getRawId(block)); + blockDesc.addProperty("id", Registry.BLOCK.getRawId(block)); blockDesc.addProperty("name", registryKey.getPath()); blockDesc.addProperty("displayName", DGU.translateText(localizationKey)); @@ -148,8 +148,8 @@ public class BlocksDataGenerator implements IDataGenerator { blockDesc.addProperty("filterLight", defaultState.getOpacity(EmptyBlockView.INSTANCE, BlockPos.ORIGIN)); blockDesc.addProperty("defaultState", Block.getRawIdFromState(defaultState)); - blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.get(0))); - blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.get(blockStates.size() - 1))); + blockDesc.addProperty("minStateId", Block.getRawIdFromState(blockStates.getFirst())); + blockDesc.addProperty("maxStateId", Block.getRawIdFromState(blockStates.getLast())); JsonArray stateProperties = new JsonArray(); for (Property property : block.getStateManager().getProperties()) { @@ -167,7 +167,7 @@ public class BlocksDataGenerator implements IDataGenerator { } List actualBlockDrops = new ArrayList<>(); - populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.get(0), actualBlockDrops); + populateDropsIfPossible(defaultState, effectiveTools.isEmpty() ? Items.AIR : effectiveTools.getFirst(), actualBlockDrops); JsonArray dropsArray = new JsonArray(); for (ItemStack dropStack : actualBlockDrops) { @@ -189,10 +189,9 @@ public class BlocksDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultBlocksArray = new JsonArray(); - Registry blockRegistry = Registry.BLOCK; List availableMaterials = MaterialsDataGenerator.getGlobalMaterialInfo(); - blockRegistry.forEach(block -> resultBlocksArray.add(generateBlock(blockRegistry, availableMaterials, block))); + Registry.BLOCK.forEach(block -> resultBlocksArray.add(generateBlock(availableMaterials, block))); return resultBlocksArray; } } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java deleted file mode 100644 index 1c755d5..0000000 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java +++ /dev/null @@ -1,78 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; -import com.google.gson.internal.Streams; -import com.google.gson.stream.JsonWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - -public class DataGenerators { - - private static final Logger logger = LoggerFactory.getLogger(DataGenerators.class); - private static final List GENERATORS = new ArrayList<>(); - - static { - register(new BiomesDataGenerator()); - register(new BlockCollisionShapesDataGenerator()); - register(new BlocksDataGenerator()); - register(new EffectsDataGenerator()); - register(new EnchantmentsDataGenerator()); - register(new EntitiesDataGenerator()); - register(new FoodsDataGenerator()); - register(new ItemsDataGenerator()); - register(new ParticlesDataGenerator()); - register(new TintsDataGenerator()); -// register(new MaterialsDataGenerator()); -// register(new RecipeDataGenerator()); - On hold until mcdata supports multiple materials for a recipe - register(new LanguageDataGenerator()); - register(new InstrumentsDataGenerator()); - register(new SoundsDataGenerator()); - } - - public static void register(IDataGenerator generator) { - GENERATORS.add(generator); - } - - public static boolean runDataGenerators(Path outputDirectory) { - try { - Files.createDirectories(outputDirectory); - } catch (IOException exception) { - logger.error("Failed to create data generator output directory at {}", outputDirectory, exception); - return false; - } - - int generatorsFailed = 0; - logger.info("Running minecraft data generators, output at {}", outputDirectory); - - for (IDataGenerator dataGenerator : GENERATORS) { - logger.info("Running generator {}", dataGenerator.getDataName()); - try { - String outputFileName = String.format("%s.json", dataGenerator.getDataName()); - JsonElement outputElement = dataGenerator.generateDataJson(); - Path outputFilePath = outputDirectory.resolve(outputFileName); - - try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { - JsonWriter jsonWriter = new JsonWriter(writer); - jsonWriter.setIndent(" "); - Streams.write(outputElement, jsonWriter); - } - logger.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); - - } catch (Throwable exception) { - logger.error("Failed to run data generator {}", dataGenerator.getDataName(), exception); - generatorsFailed++; - } - } - - logger.info("Finishing running data generators"); - return generatorsFailed == 0; - } -} diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java index 1c9849e..9b4beb5 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EffectsDataGenerator.java @@ -13,7 +13,6 @@ import java.util.Arrays; import java.util.stream.Collectors; public class EffectsDataGenerator implements IDataGenerator { - public static JsonObject generateEffect(Registry registry, StatusEffect statusEffect) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(statusEffect).orElseThrow().getValue(); 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 e27fb68..dce173a 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EnchantmentsDataGenerator.java @@ -11,24 +11,10 @@ import net.minecraft.util.registry.Registry; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; public class EnchantmentsDataGenerator implements IDataGenerator { private static final ImmutableMap ENCHANTMENT_TARGET_NAMES = ImmutableMap.builder() - .put(EnchantmentTarget.ARMOR, "armor") - .put(EnchantmentTarget.ARMOR_FEET, "armor_feet") - .put(EnchantmentTarget.ARMOR_LEGS, "armor_legs") - .put(EnchantmentTarget.ARMOR_CHEST, "armor_chest") - .put(EnchantmentTarget.ARMOR_HEAD, "armor_head") - .put(EnchantmentTarget.WEAPON, "weapon") - .put(EnchantmentTarget.DIGGER, "digger") - .put(EnchantmentTarget.FISHING_ROD, "fishing_rod") - .put(EnchantmentTarget.TRIDENT, "trident") - .put(EnchantmentTarget.BREAKABLE, "breakable") - .put(EnchantmentTarget.BOW, "bow") - .put(EnchantmentTarget.WEARABLE, "wearable") - .put(EnchantmentTarget.CROSSBOW, "crossbow") .put(EnchantmentTarget.VANISHABLE, "vanishable") .build(); diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java index c11cb03..d1973e7 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java @@ -2,7 +2,6 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -18,10 +17,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import java.lang.reflect.ParameterizedType; - public class EntitiesDataGenerator implements IDataGenerator { - public static JsonObject generateEntity(Registry> entityRegistry, EntityType entityType) { JsonObject entityDesc = new JsonObject(); Identifier registryKey = entityRegistry.getKey(entityType).orElseThrow().getValue(); @@ -50,17 +46,11 @@ public class EntitiesDataGenerator implements IDataGenerator { private static String getCategoryFrom(EntityType entityType) { if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities - Class entityClazz = null; - try { - for (var field : EntityType.class.getFields()) - if (entityType == field.get(EntityType.class)) - entityClazz = (Class) ((ParameterizedType) TypeToken.get(field.getGenericType()).getType()).getActualTypeArguments()[0]; - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - if (entityClazz == null) throw new RuntimeException("Shouldn't be null..."); - return switch (entityClazz.getPackageName()) { + Entity entity = entityType.create(DGU.getWorld()); + if (entity == null) + throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey())); + entity.discard(); + return switch (entity.getClass().getPackageName()) { 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"; @@ -68,7 +58,7 @@ public class EntitiesDataGenerator implements IDataGenerator { case "net.minecraft.entity.passive" -> "Passive mobs"; case "net.minecraft.entity.vehicle" -> "Vehicles"; case "net.minecraft.entity" -> "UNKNOWN"; - default -> throw new Error("Unexpected entity type: " + entityClazz.getPackageName()); + default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName()); }; } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java index 45a0b35..de659be 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/FoodsDataGenerator.java @@ -11,7 +11,6 @@ import net.minecraft.util.registry.Registry; import java.util.Objects; public class FoodsDataGenerator implements IDataGenerator { - public static JsonObject generateFoodDescriptor(Registry registry, Item foodItem) { JsonObject foodDesc = new JsonObject(); Identifier registryKey = registry.getKey(foodItem).orElseThrow().getValue(); diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java deleted file mode 100644 index 81fe4e2..0000000 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.u9g.minecraftdatagenerator.generators; - -import com.google.gson.JsonElement; - -public interface IDataGenerator { - - String getDataName(); - - JsonElement generateDataJson(); -} diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java index 4253ae6..1739de2 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/MaterialsDataGenerator.java @@ -1,6 +1,5 @@ package dev.u9g.minecraftdatagenerator.generators; -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; @@ -40,7 +39,7 @@ public class MaterialsDataGenerator implements IDataGenerator { } private static void createCompositeMaterialInfo(List allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); List mappedMaterials = combinedMaterials.stream() .map(otherName -> allMaterials.stream() @@ -52,13 +51,13 @@ public class MaterialsDataGenerator implements IDataGenerator { mappedMaterials.stream().allMatch(it -> it.getPredicate().test(blockState)); MaterialInfo materialInfo = new MaterialInfo(compositeMaterialName, compositePredicate).includes(mappedMaterials); - allMaterials.add(0, materialInfo); + allMaterials.addFirst(materialInfo); } private static void createCompositeMaterial(Map> allMaterials, List combinedMaterials) { - String compositeMaterialName = Joiner.on(';').join(combinedMaterials); + String compositeMaterialName = String.join(";", combinedMaterials); - Map resultingToolSpeeds = new HashMap<>(); + Map resultingToolSpeeds = new LinkedHashMap<>(); combinedMaterials.stream() .map(allMaterials::get) .forEach(resultingToolSpeeds::putAll); @@ -105,14 +104,14 @@ public class MaterialsDataGenerator implements IDataGenerator { public JsonElement generateDataJson() { Registry itemRegistry = Registry.ITEM; - Map> materialMiningSpeeds = new HashMap<>(); + Map> materialMiningSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put("default", ImmutableMap.of()); //Special materials used for shears and swords special mining speed logic - Map leavesMaterialSpeeds = new HashMap<>(); - Map cowebMaterialSpeeds = new HashMap<>(); - Map plantMaterialSpeeds = new HashMap<>(); - Map gourdMaterialSpeeds = new HashMap<>(); + Map leavesMaterialSpeeds = new LinkedHashMap<>(); + Map cowebMaterialSpeeds = new LinkedHashMap<>(); + Map plantMaterialSpeeds = new LinkedHashMap<>(); + Map gourdMaterialSpeeds = new LinkedHashMap<>(); materialMiningSpeeds.put(makeMaterialNameForTag(BlockTags.LEAVES), leavesMaterialSpeeds); materialMiningSpeeds.put("coweb", cowebMaterialSpeeds); @@ -131,7 +130,7 @@ public class MaterialsDataGenerator implements IDataGenerator { TagKey effectiveBlocks = ((MiningToolItemAccessor) toolItem).getEffectiveBlocks(); String materialName = makeMaterialNameForTag(effectiveBlocks); - Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new HashMap<>()); + Map materialSpeeds = materialMiningSpeeds.computeIfAbsent(materialName, k -> new LinkedHashMap<>()); float miningSpeed = ((MiningToolItemAccessor) toolItem).getMiningSpeed(); materialSpeeds.put(item, miningSpeed); } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java index 5a6b108..80cca51 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/ParticlesDataGenerator.java @@ -7,7 +7,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class ParticlesDataGenerator implements IDataGenerator { - public static JsonObject generateParticleType(Registry> registry, ParticleType particleType) { JsonObject effectDesc = new JsonObject(); Identifier registryKey = registry.getKey(particleType).orElseThrow().getValue(); diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index edbc986..585eb21 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -5,13 +5,11 @@ import com.google.gson.JsonObject; import net.minecraft.sound.SoundEvent; import net.minecraft.util.registry.Registry; - public class SoundsDataGenerator implements IDataGenerator { - - public static JsonObject generateSound(Registry registry, SoundEvent soundEvent) { + public static JsonObject generateSound(SoundEvent soundEvent) { JsonObject soundDesc = new JsonObject(); - soundDesc.addProperty("id", registry.getRawId(soundEvent)); + soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); soundDesc.addProperty("name", soundEvent.getId().getPath()); return soundDesc; @@ -25,8 +23,7 @@ public class SoundsDataGenerator implements IDataGenerator { @Override public JsonArray generateDataJson() { JsonArray resultsArray = new JsonArray(); - Registry soundEventRegistry = Registry.SOUND_EVENT; - soundEventRegistry.forEach(sound -> resultsArray.add(generateSound(soundEventRegistry, sound))); + Registry.SOUND_EVENT.forEach(sound -> resultsArray.add(generateSound(sound))); return resultsArray; } } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 283cc43..40da4f4 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -4,7 +4,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import dev.u9g.minecraftdatagenerator.util.EmptyRenderBlockView; import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -20,7 +19,6 @@ import net.minecraft.world.biome.Biome; import java.util.*; public class TintsDataGenerator implements IDataGenerator { - public static BiomeTintColors generateBiomeTintColors(Registry biomeRegistry) { BiomeTintColors colors = new BiomeTintColors(); @@ -37,7 +35,7 @@ public class TintsDataGenerator implements IDataGenerator { } public static Map generateRedstoneTintColors() { - Map resultColors = new HashMap<>(); + Map resultColors = new LinkedHashMap<>(); for (int redstoneLevel : RedstoneWireBlock.POWER.getValues()) { int color = RedstoneWireBlock.getWireColor(redstoneLevel); @@ -46,26 +44,23 @@ public class TintsDataGenerator implements IDataGenerator { return resultColors; } - @Environment(EnvType.CLIENT) - private static int getBlockColor(Block block, BlockColors blockColors) { - return blockColors.getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); + private static int getBlockColor(Block block) { + return BlockColors.create().getColor(block.getDefaultState(), EmptyRenderBlockView.INSTANCE, BlockPos.ORIGIN, 0xFFFFFF); } - @Environment(EnvType.CLIENT) public static Map generateConstantTintColors() { - Map resultColors = new HashMap<>(); - BlockColors blockColors = BlockColors.create(); + Map resultColors = new LinkedHashMap<>(); resultColors.put(Blocks.BIRCH_LEAVES, FoliageColors.getBirchColor()); resultColors.put(Blocks.SPRUCE_LEAVES, FoliageColors.getSpruceColor()); - resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD, blockColors)); - resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM, blockColors)); - resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.LILY_PAD, getBlockColor(Blocks.LILY_PAD)); + resultColors.put(Blocks.ATTACHED_MELON_STEM, getBlockColor(Blocks.ATTACHED_MELON_STEM)); + resultColors.put(Blocks.ATTACHED_PUMPKIN_STEM, getBlockColor(Blocks.ATTACHED_PUMPKIN_STEM)); //not really constant, depend on the block age, but kinda have to be handled since textures are literally white without them - resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM, blockColors)); - resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM, blockColors)); + resultColors.put(Blocks.MELON_STEM, getBlockColor(Blocks.MELON_STEM)); + resultColors.put(Blocks.PUMPKIN_STEM, getBlockColor(Blocks.PUMPKIN_STEM)); return resultColors; } @@ -161,8 +156,8 @@ public class TintsDataGenerator implements IDataGenerator { } public static class BiomeTintColors { - final Map> grassColoursMap = new HashMap<>(); - final Map> foliageColoursMap = new HashMap<>(); - final Map> waterColourMap = new HashMap<>(); + final Map> grassColoursMap = new LinkedHashMap<>(); + final Map> foliageColoursMap = new LinkedHashMap<>(); + final Map> waterColourMap = new LinkedHashMap<>(); } } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java deleted file mode 100644 index 40e926a..0000000 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ClientPlayerInteractionManagerMixin.java +++ /dev/null @@ -1,57 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import com.google.common.base.Preconditions; -import net.minecraft.block.BlockState; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerInteractionManager; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.World; -import org.objectweb.asm.Opcodes; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(ClientPlayerInteractionManager.class) -public abstract class ClientPlayerInteractionManagerMixin { - @Unique - private long blockBreakingStartTicks; - @Unique - private BlockState stateBeingBroken; - - @Inject(method = "attackBlock", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;currentBreakingProgress:F", opcode = Opcodes.PUTFIELD)) - private void onBlockAttacked(BlockPos pos, Direction direction, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.blockBreakingStartTicks = world.getTime(); - } - - @Inject(method = "cancelBlockBreaking", at = @At("HEAD")) - private void onBlockBreakingCanceled(CallbackInfo callbackInfo) { - this.blockBreakingStartTicks = -1L; - } - - @Inject(method = "breakBlock", at = @At("HEAD")) - private void onBreakBlockHead(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - this.stateBeingBroken = world.getBlockState(pos); - } - - @Inject(method = "breakBlock", at = @At("RETURN")) - private void onBreakBlockReturn(BlockPos pos, CallbackInfoReturnable callbackInfo) { - World world = Preconditions.checkNotNull(MinecraftClient.getInstance().world); - if (callbackInfo.getReturnValue()) { - Preconditions.checkNotNull(stateBeingBroken); - if (blockBreakingStartTicks != -1L) { - long totalTicksElapsed = world.getTime() - this.blockBreakingStartTicks; - long totalTimeElapsed = totalTicksElapsed * 50L; - System.out.printf("Breaking block %s took %dms%n", stateBeingBroken.getBlock(), totalTimeElapsed); - } else { - System.out.printf("Breaking block %s took 0ms [INSTANT BREAK]%n", stateBeingBroken.getBlock()); - } - } - this.blockBreakingStartTicks = -1L; - } -} 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 ba3b26b..c904c15 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java @@ -1,7 +1,6 @@ package dev.u9g.minecraftdatagenerator.mixin; -import dev.u9g.minecraftdatagenerator.Main; -import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import dev.u9g.minecraftdatagenerator.MinecraftDataGenerator; import dev.u9g.minecraftdatagenerator.util.DGU; import net.minecraft.MinecraftVersion; import net.minecraft.server.dedicated.MinecraftDedicatedServer; @@ -10,18 +9,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.nio.file.Path; - @Mixin(MinecraftDedicatedServer.class) public class ReadyMixin { @Inject(method = "setupServer()Z", at = @At("TAIL")) private void init(CallbackInfoReturnable cir) { - Main.LOGGER.info("Starting data generation!"); - String versionName = MinecraftVersion.CURRENT.getName(); - Path serverRootDirectory = DGU.getCurrentlyRunningServer().getRunDirectory().toPath().toAbsolutePath(); - Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); - DataGenerators.runDataGenerators(dataDumpDirectory); - Main.LOGGER.info("Done data generation!"); - Runtime.getRuntime().halt(0); + MinecraftDataGenerator.start( + MinecraftVersion.CURRENT.getName(), + DGU.getCurrentlyRunningServer().getRunDirectory().toPath() + ); } } diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java deleted file mode 100644 index 4a75ab3..0000000 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/mixin/TheEndBiomeDataAccessor.java +++ /dev/null @@ -1,28 +0,0 @@ -package dev.u9g.minecraftdatagenerator.mixin; - -import net.fabricmc.fabric.impl.biome.TheEndBiomeData; -import net.fabricmc.fabric.impl.biome.WeightedPicker; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -import java.util.Map; - -@Mixin(TheEndBiomeData.class) -public interface TheEndBiomeDataAccessor { - @Accessor("END_BIOMES_MAP") - static Map, WeightedPicker>> END_BIOMES_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor("END_MIDLANDS_MAP") - static Map, WeightedPicker>> END_MIDLANDS_MAP() { - throw new IllegalStateException("Should never be called."); - } - - @Accessor("END_BARRENS_MAP") - static Map, WeightedPicker>> END_BARRENS_MAP() { - throw new IllegalStateException("Should never be called."); - } -} diff --git a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java index 5945fa0..3946c1f 100644 --- a/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java +++ b/22w19a/src/main/java/dev/u9g/minecraftdatagenerator/util/DGU.java @@ -1,57 +1,18 @@ package dev.u9g.minecraftdatagenerator.util; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.resource.language.I18n; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Language; import net.minecraft.world.World; public class DGU { - - private static final Language language = Language.getInstance(); - - @Environment(EnvType.CLIENT) - private static MinecraftServer getCurrentlyRunningServerClient() { - return MinecraftClient.getInstance().getServer(); - } - @SuppressWarnings("deprecation") - private static MinecraftServer getCurrentlyRunningServerDedicated() { + public static MinecraftServer getCurrentlyRunningServer() { return (MinecraftServer) FabricLoader.getInstance().getGameInstance(); } - public static MinecraftServer getCurrentlyRunningServer() { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return getCurrentlyRunningServerClient(); - } else if (environmentType == EnvType.SERVER) { - return getCurrentlyRunningServerDedicated(); - } - throw new UnsupportedOperationException(); - } - - @Environment(EnvType.CLIENT) - private static String translateTextClient(String translationKey) { - return I18n.translate(translationKey); - } - - private static String translateTextFallback(String translationKey) { - try { - return language.get(translationKey); - } catch (Exception ignored) { - } - throw new RuntimeException("Failed to translate: '" + translationKey + "'"); - } - public static String translateText(String translationKey) { - EnvType environmentType = FabricLoader.getInstance().getEnvironmentType(); - if (environmentType == EnvType.CLIENT) { - return translateTextClient(translationKey); - } - return translateTextFallback(translationKey); + return Language.getInstance().get(translationKey); } public static World getWorld() { diff --git a/22w19a/src/main/resources/fabric.mod.json b/22w19a/src/main/resources/fabric.mod.json index 9f6ef32..ffac96b 100644 --- a/22w19a/src/main/resources/fabric.mod.json +++ b/22w19a/src/main/resources/fabric.mod.json @@ -10,18 +10,11 @@ ], "contact": {}, "license": "MIT", - "environment": "server", - "entrypoints": { - "main": [ - "dev.u9g.minecraftdatagenerator.Main" - ] - }, "mixins": [ "minecraft-data-generator.mixins.json" ], "depends": { - "fabricloader": ">=0.14.5", - "fabric": "*", - "minecraft": ">=1.18" + "fabricloader": "*", + "minecraft": "*" } } diff --git a/22w19a/src/main/resources/minecraft-data-generator.mixins.json b/22w19a/src/main/resources/minecraft-data-generator.mixins.json index 9e8d416..b8f9bb3 100644 --- a/22w19a/src/main/resources/minecraft-data-generator.mixins.json +++ b/22w19a/src/main/resources/minecraft-data-generator.mixins.json @@ -4,10 +4,8 @@ "package": "dev.u9g.minecraftdatagenerator.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "ClientPlayerInteractionManagerMixin", "MiningToolItemAccessor", - "ReadyMixin", - "TheEndBiomeDataAccessor" + "ReadyMixin" ], "client": [ ], diff --git a/README.md b/README.md index a13bc78..209c5f0 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,13 @@ 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 ``` diff --git a/build.gradle b/build.gradle index c638bd1..6b15530 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,20 @@ allprojects { version = "1.0.0-SNAPSHOT" group = "dev.u9g" + + repositories { + maven { + name = "wagyourtail releases" + url = "https://maven.wagyourtail.xyz/releases" + } + maven { + name = "legacyfabric" + url = "https://maven.legacyfabric.net/" + } + maven { + name = "fabric" + url = "https://maven.fabricmc.net/" + } + mavenCentral() + } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..78a1702 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,56 @@ +plugins { + `kotlin-dsl` +} + +repositories { + maven("https://maven.wagyourtail.xyz/releases") { + name = "WagYourReleases" + } + maven("https://maven.wagyourtail.xyz/snapshots") { + name = "WagYourSnapshots" + } + gradlePluginPortal() + mavenCentral() +} + +dependencies { + implementation("xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.2.15-SNAPSHOT") + + // guava + implementation("com.google.guava:guava:31.1-jre") + + // gson + implementation("com.google.code.gson:gson:2.9.0") + + // asm + implementation("org.ow2.asm:asm:9.5") + implementation("org.ow2.asm:asm-commons:9.5") + implementation("org.ow2.asm:asm-tree:9.5") + implementation("org.ow2.asm:asm-analysis:9.5") + implementation("org.ow2.asm:asm-util:9.5") + + // remapper + implementation("net.fabricmc:tiny-remapper:0.8.7") { + exclude(group = "org.ow2.asm") + } + + // mappings + implementation("net.fabricmc:mapping-io:0.3.0") { + exclude(group = "org.ow2.asm") + } + + // jetbrains annotations + implementation("org.jetbrains:annotations-java5:23.0.0") + + // binpatcher + implementation("net.minecraftforge:binarypatcher:1.1.1") { + exclude(mapOf("group" to "commons-io")) + } + implementation("commons-io:commons-io:2.12.0") + + // pack200 provided by apache commons-compress + implementation("org.apache.commons:commons-compress:1.26.1") + + // aw + implementation("net.fabricmc:access-widener:2.1.0") +} diff --git a/buildSrc/src/main/kotlin/CustomLegacyFabricMinecraftTransformer.kt b/buildSrc/src/main/kotlin/CustomLegacyFabricMinecraftTransformer.kt new file mode 100644 index 0000000..7bd16a7 --- /dev/null +++ b/buildSrc/src/main/kotlin/CustomLegacyFabricMinecraftTransformer.kt @@ -0,0 +1,23 @@ +import org.gradle.api.Project +import xyz.wagyourtail.unimined.api.minecraft.EnvType +import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider +import xyz.wagyourtail.unimined.internal.minecraft.patch.fabric.LegacyFabricMinecraftTransformer +import xyz.wagyourtail.unimined.internal.minecraft.transform.merge.ClassMerger + +// Prevents adding @Environment annotations to classes +@Suppress("UnstableApiUsage") +class CustomLegacyFabricMinecraftTransformer( + project: Project, + provider: MinecraftProvider +) : LegacyFabricMinecraftTransformer(project, provider) { + override val merger: ClassMerger = ClassMerger() + + override fun mergedJar(clientjar: MinecraftJar, serverjar: MinecraftJar): MinecraftJar { + return MinecraftJar( + clientjar, + envType = EnvType.COMBINED, + patches = listOf("$providerName-merged", "custom-no-environment") + clientjar.patches + serverjar.patches + ) + } +} diff --git a/buildSrc/src/main/kotlin/CustomOfficialFabricMinecraftTransformer.kt b/buildSrc/src/main/kotlin/CustomOfficialFabricMinecraftTransformer.kt new file mode 100644 index 0000000..741d1e6 --- /dev/null +++ b/buildSrc/src/main/kotlin/CustomOfficialFabricMinecraftTransformer.kt @@ -0,0 +1,23 @@ +import org.gradle.api.Project +import xyz.wagyourtail.unimined.api.minecraft.EnvType +import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar +import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider +import xyz.wagyourtail.unimined.internal.minecraft.patch.fabric.OfficialFabricMinecraftTransformer +import xyz.wagyourtail.unimined.internal.minecraft.transform.merge.ClassMerger + +// Prevents adding @Environment annotations to classes +@Suppress("UnstableApiUsage") +class CustomOfficialFabricMinecraftTransformer( + project: Project, + provider: MinecraftProvider +) : OfficialFabricMinecraftTransformer(project, provider) { + override val merger: ClassMerger = ClassMerger() + + override fun mergedJar(clientjar: MinecraftJar, serverjar: MinecraftJar): MinecraftJar { + return MinecraftJar( + clientjar, + envType = EnvType.COMBINED, + patches = listOf("$providerName-merged", "custom-no-environment") + clientjar.patches + serverjar.patches + ) + } +} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..8d1503d --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java' +} + +dependencies { + compileOnly 'com.google.code.gson:gson:2.10.1' + implementation 'io.github.classgraph:classgraph:4.8.172' + implementation "net.lenni0451:Reflect:1.3.3" + implementation 'org.slf4j:slf4j-api:2.0.13' + implementation "org.slf4j:jul-to-slf4j:2.0.13" +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} diff --git a/common/src/main/java/dev/u9g/minecraftdatagenerator/MinecraftDataGenerator.java b/common/src/main/java/dev/u9g/minecraftdatagenerator/MinecraftDataGenerator.java new file mode 100644 index 0000000..6671bef --- /dev/null +++ b/common/src/main/java/dev/u9g/minecraftdatagenerator/MinecraftDataGenerator.java @@ -0,0 +1,24 @@ +package dev.u9g.minecraftdatagenerator; + +import dev.u9g.minecraftdatagenerator.generators.DataGenerators; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FileDescriptor; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.nio.file.Path; + +public class MinecraftDataGenerator { + private static final Logger LOGGER = LoggerFactory.getLogger(MinecraftDataGenerator.class); + + public static void start(String versionName, Path serverRootDirectory) { + System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out))); + System.setErr(new PrintStream(new FileOutputStream(FileDescriptor.err))); + MinecraftDataGenerator.LOGGER.info("Starting data generation!"); + Path dataDumpDirectory = serverRootDirectory.resolve("minecraft-data").resolve(versionName); + DataGenerators.runDataGenerators(dataDumpDirectory); + MinecraftDataGenerator.LOGGER.info("Done data generation!"); + Runtime.getRuntime().halt(0); + } +} diff --git a/common/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java b/common/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java new file mode 100644 index 0000000..ff7a302 --- /dev/null +++ b/common/src/main/java/dev/u9g/minecraftdatagenerator/generators/DataGenerators.java @@ -0,0 +1,82 @@ +package dev.u9g.minecraftdatagenerator.generators; + +import com.google.gson.JsonElement; +import com.google.gson.internal.Streams; +import com.google.gson.stream.JsonWriter; +import io.github.classgraph.ClassGraph; +import io.github.classgraph.ScanResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.List; + +public class DataGenerators { + private static final List GENERATORS = new ArrayList<>(); + private static final Logger LOGGER = LoggerFactory.getLogger(DataGenerators.class); + + static { + List> generators; + try (ScanResult scanResult = new ClassGraph() + .acceptPackages("dev.u9g.minecraftdatagenerator.generators") + .overrideClassLoaders(IDataGenerator.class.getClassLoader()) + .enableClassInfo().scan()) { + generators = scanResult + .getClassesImplementing(IDataGenerator.class) + .loadClasses(IDataGenerator.class); + } + + for (Class generatorClass : generators) { + try { + GENERATORS.add(generatorClass.getDeclaredConstructor().newInstance()); + } catch (ReflectiveOperationException e) { + LOGGER.error("Failed to instantiate data generator {}", generatorClass.getName(), e); + } + } + } + + public static boolean runDataGenerators(Path outputDirectory) { + try { + Files.createDirectories(outputDirectory); + } catch (IOException e) { + LOGGER.error("Failed to create data generator output directory at {}", outputDirectory, e); + return false; + } + + int generatorsFailed = 0; + LOGGER.info("Running minecraft data generators, output at {}", outputDirectory); + + for (IDataGenerator dataGenerator : GENERATORS) { + if (!dataGenerator.isEnabled()) { + LOGGER.info("Skipping disabled generator {}", dataGenerator.getDataName()); + continue; + } + + LOGGER.info("Running generator {}", dataGenerator.getDataName()); + try { + String outputFileName = String.format("%s.json", dataGenerator.getDataName()); + JsonElement outputElement = dataGenerator.generateDataJson(); + Path outputFilePath = outputDirectory.resolve(outputFileName); + + try (Writer writer = Files.newBufferedWriter(outputFilePath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) { + JsonWriter jsonWriter = new JsonWriter(writer); + jsonWriter.setIndent(" "); + Streams.write(outputElement, jsonWriter); + } + + LOGGER.info("Generator: {} -> {}", dataGenerator.getDataName(), outputFileName); + } catch (Throwable e) { + LOGGER.error("Failed to run data generator {}", dataGenerator.getDataName(), e); + generatorsFailed++; + } + } + + LOGGER.info("Finishing running data generators"); + return generatorsFailed == 0; + } +} diff --git a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java b/common/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java similarity index 75% rename from 1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java rename to common/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java index 81fe4e2..faa74f9 100644 --- a/1.10.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java +++ b/common/src/main/java/dev/u9g/minecraftdatagenerator/generators/IDataGenerator.java @@ -3,8 +3,11 @@ package dev.u9g.minecraftdatagenerator.generators; import com.google.gson.JsonElement; public interface IDataGenerator { - String getDataName(); JsonElement generateDataJson(); + + default boolean isEnabled() { + return true; + } } diff --git a/gradle.properties b/gradle.properties index bde2fd1..3693d2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,8 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx4G -Xms256m -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - org.gradle.daemon=true - org.gradle.configureondemand=true org.gradle.cache=true org.gradle.caching=true org.gradle.parallel=true - org.gradle.vfs.watch=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..d64cd4917707c1f8861d8cb53dd15194d4248596 100644 GIT binary patch literal 43462 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 literal 61574 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 ScNgau(U?ep-K_E5zy1%ZQTdPn diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/settings.gradle b/settings.gradle index ab5a196..62448b6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,33 +1,16 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + +dependencyResolutionManagement { + versionCatalogs { + libs { + version('fabric-loader', '0.15.10') } - gradlePluginPortal() - } - plugins { - id 'fabric-loom' version "1.4.5" } } -dependencyResolutionManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - maven { - name = "legacy-fabric" - url = "https://maven.legacyfabric.net" - } - maven { - name = "u9g" - url = "https://maven.u9g.dev" - } - mavenCentral() - } -} +include "common" [ "1.7", @@ -47,4 +30,5 @@ dependencyResolutionManagement { "1.19.2", "1.20", "1.20.4", + "1.20.5", ].forEach { include it }