diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 57a8eb11a..e76ef7433 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,7 +27,7 @@ repos: exclude: "^(.*\\.(bat)|LICENSE)$" - repo: https://github.com/fsfe/reuse-tool - rev: v4.0.3 + rev: v5.0.2 hooks: - id: reuse diff --git a/REUSE.toml b/REUSE.toml index 88259ac93..399671555 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -17,14 +17,14 @@ path = [ "projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg", "projects/common/src/testMod/resources/data/cctest/computercraft/turtle_upgrades/**", "projects/common/src/testMod/resources/data/cctest/structures/**", - "projects/**/src/generated/**", + "projects/*/src/generated/**", "projects/web/src/htmlTransform/export/index.json", "projects/web/src/htmlTransform/export/items/minecraft/**", # GitHub build scripts are CC0. While we could add a header to each file, # it's unclear if it will break actions or issue templates in some way. ".github/**", # Example mod is CC0. - "projects/**/src/examples/**" + "projects/*/src/examples/**" ] [[annotations]] @@ -35,22 +35,15 @@ path = [ "doc/images/**", "package.json", "package-lock.json", - "projects/common/src/client/resources/computercraft-client.mixins.json", + "projects/*/src/*/resources/*.mixins.json", + "projects/fabric/src/*/resources/fabric.mod.json", "projects/common/src/main/resources/assets/minecraft/shaders/core/computercraft/monitor_tbo.json", - "projects/common/src/main/resources/computercraft.mixins.json", - "projects/common/src/testMod/resources/computercraft-gametest.mixins.json", "projects/common/src/testMod/resources/data/computercraft/loot_tables/treasure_disk.json", "projects/common/src/testMod/resources/pack.mcmeta", "projects/core/src/main/resources/data/computercraft/lua/rom/modules/command/.ignoreme", "projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme", "projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme", "projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt", - "projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json", - "projects/fabric/src/datagen/resources/fabric.mod.json", - "projects/fabric/src/main/resources/computercraft.fabric.mixins.json", - "projects/fabric/src/main/resources/fabric.mod.json", - "projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json", - "projects/fabric/src/testMod/resources/fabric.mod.json", "projects/web/src/frontend/mount/.settings", "projects/web/src/frontend/mount/example.nfp", "projects/web/src/frontend/mount/example.nft", diff --git a/projects/fabric/src/main/java/dan200/computercraft/mixin/TagEntryAccessor.java b/projects/fabric/src/datagen/java/dan200/computercraft/mixin/TagEntryAccessor.java similarity index 100% rename from projects/fabric/src/main/java/dan200/computercraft/mixin/TagEntryAccessor.java rename to projects/fabric/src/datagen/java/dan200/computercraft/mixin/TagEntryAccessor.java diff --git a/projects/fabric/src/main/java/dan200/computercraft/mixin/TagsProviderMixin.java b/projects/fabric/src/datagen/java/dan200/computercraft/mixin/TagsProviderMixin.java similarity index 100% rename from projects/fabric/src/main/java/dan200/computercraft/mixin/TagsProviderMixin.java rename to projects/fabric/src/datagen/java/dan200/computercraft/mixin/TagsProviderMixin.java diff --git a/projects/fabric/src/datagen/resources/computercraft-datagen.fabric.mixins.json b/projects/fabric/src/datagen/resources/computercraft-datagen.fabric.mixins.json new file mode 100644 index 000000000..68fa2ec48 --- /dev/null +++ b/projects/fabric/src/datagen/resources/computercraft-datagen.fabric.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "dan200.computercraft.mixin", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_17", + "injectors": { + "defaultRequire": 1 + }, + "mixins": [ + "TagEntryAccessor", + "TagsProviderMixin" + ] +} diff --git a/projects/fabric/src/datagen/resources/fabric.mod.json b/projects/fabric/src/datagen/resources/fabric.mod.json index 1daa9ec5f..8da5bef37 100644 --- a/projects/fabric/src/datagen/resources/fabric.mod.json +++ b/projects/fabric/src/datagen/resources/fabric.mod.json @@ -9,5 +9,8 @@ }, "depends": { "computercraft": "*" - } + }, + "mixins": [ + "computercraft-datagen.fabric.mixins.json" + ] } diff --git a/projects/fabric/src/main/resources/computercraft.fabric.mixins.json b/projects/fabric/src/main/resources/computercraft.fabric.mixins.json index d52054c29..f8b2e7faf 100644 --- a/projects/fabric/src/main/resources/computercraft.fabric.mixins.json +++ b/projects/fabric/src/main/resources/computercraft.fabric.mixins.json @@ -13,8 +13,6 @@ "ExplosionDamageCalculatorMixin", "ItemEntityMixin", "ItemMixin", - "ServerLevelMixin", - "TagEntryAccessor", - "TagsProviderMixin" + "ServerLevelMixin" ] }