mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-10-21 17:07:39 +00:00
Move Fabric datagen mixins to datagen module
This way they don't interfere with other mods doing datagen. Also bump reuse version, to fix issues with globs.
This commit is contained in:
@@ -27,7 +27,7 @@ repos:
|
|||||||
exclude: "^(.*\\.(bat)|LICENSE)$"
|
exclude: "^(.*\\.(bat)|LICENSE)$"
|
||||||
|
|
||||||
- repo: https://github.com/fsfe/reuse-tool
|
- repo: https://github.com/fsfe/reuse-tool
|
||||||
rev: v4.0.3
|
rev: v5.0.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: reuse
|
- id: reuse
|
||||||
|
|
||||||
|
15
REUSE.toml
15
REUSE.toml
@@ -17,14 +17,14 @@ path = [
|
|||||||
"projects/common/src/main/resources/assets/computercraft/sounds/empty.ogg",
|
"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/computercraft/turtle_upgrades/**",
|
||||||
"projects/common/src/testMod/resources/data/cctest/structures/**",
|
"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/index.json",
|
||||||
"projects/web/src/htmlTransform/export/items/minecraft/**",
|
"projects/web/src/htmlTransform/export/items/minecraft/**",
|
||||||
# GitHub build scripts are CC0. While we could add a header to each file,
|
# 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.
|
# it's unclear if it will break actions or issue templates in some way.
|
||||||
".github/**",
|
".github/**",
|
||||||
# Example mod is CC0.
|
# Example mod is CC0.
|
||||||
"projects/**/src/examples/**"
|
"projects/*/src/examples/**"
|
||||||
]
|
]
|
||||||
|
|
||||||
[[annotations]]
|
[[annotations]]
|
||||||
@@ -35,22 +35,15 @@ path = [
|
|||||||
"doc/images/**",
|
"doc/images/**",
|
||||||
"package.json",
|
"package.json",
|
||||||
"package-lock.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/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/data/computercraft/loot_tables/treasure_disk.json",
|
||||||
"projects/common/src/testMod/resources/pack.mcmeta",
|
"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/command/.ignoreme",
|
||||||
"projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.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/modules/turtle/.ignoreme",
|
||||||
"projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt",
|
"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/.settings",
|
||||||
"projects/web/src/frontend/mount/example.nfp",
|
"projects/web/src/frontend/mount/example.nfp",
|
||||||
"projects/web/src/frontend/mount/example.nft",
|
"projects/web/src/frontend/mount/example.nft",
|
||||||
|
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"package": "dan200.computercraft.mixin",
|
||||||
|
"minVersion": "0.8",
|
||||||
|
"compatibilityLevel": "JAVA_17",
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
},
|
||||||
|
"mixins": [
|
||||||
|
"TagEntryAccessor",
|
||||||
|
"TagsProviderMixin"
|
||||||
|
]
|
||||||
|
}
|
@@ -9,5 +9,8 @@
|
|||||||
},
|
},
|
||||||
"depends": {
|
"depends": {
|
||||||
"computercraft": "*"
|
"computercraft": "*"
|
||||||
}
|
},
|
||||||
|
"mixins": [
|
||||||
|
"computercraft-datagen.fabric.mixins.json"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
@@ -13,8 +13,6 @@
|
|||||||
"ExplosionDamageCalculatorMixin",
|
"ExplosionDamageCalculatorMixin",
|
||||||
"ItemEntityMixin",
|
"ItemEntityMixin",
|
||||||
"ItemMixin",
|
"ItemMixin",
|
||||||
"ServerLevelMixin",
|
"ServerLevelMixin"
|
||||||
"TagEntryAccessor",
|
|
||||||
"TagsProviderMixin"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user