From 2038d0b297e73d3274105457ea951d077f8b7d93 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 8 Feb 2024 11:23:27 +0100 Subject: [PATCH] Port legacy-fabric-permissions-api-v1 --- 1.8.9/legacy-fabric-permissions-api-v1/build.gradle | 8 -------- .../build.gradle | 7 ------- legacy-fabric-permissions-api-v1/1.8.9/build.gradle | 0 .../1.8.9/gradle.properties | 2 ++ .../mixin/permission/CommandBlockExecutorMixin.java | 0 .../mixin/permission/CommandStats_1Mixin.java | 0 .../fabric/mixin/permission/ConsoleMixin.java | 0 .../fabric/mixin/permission/EntityMixin.java | 0 .../mixin/permission/ExecuteCommand_1Mixin.java | 0 .../mixin/permission/ServerPlayerEntityMixin.java | 0 .../mixin/permission/SignBlockEntity_1Mixin.java | 0 .../mixin/permission/SignBlockEntity_2Mixin.java | 0 .../legacy-fabric-permissions-api-v1/icon.png | Bin .../1.8.9}/src/main/resources/fabric.mod.json | 2 +- .../legacy-fabric-permissions-api-v1.mixins.json | 0 legacy-fabric-permissions-api-v1/common.gradle | 3 +++ .../common/build.gradle | 0 .../common/gradle.properties | 2 ++ .../api/permission/v1/PermissibleCommandSource.java | 0 .../api/permission/v1/PermissionsApiHolder.java | 0 .../api/permission/v1/PlayerPermissionsApi.java | 0 .../legacy-fabric-permissions-api-v1/icon.png | Bin .../common}/src/main/resources/fabric.mod.json | 2 +- settings.gradle | 1 + 24 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 1.8.9/legacy-fabric-permissions-api-v1/build.gradle delete mode 100644 common/legacy-fabric-permissions-api-v1-common/build.gradle create mode 100644 legacy-fabric-permissions-api-v1/1.8.9/build.gradle create mode 100644 legacy-fabric-permissions-api-v1/1.8.9/gradle.properties rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandStats_1Mixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/ConsoleMixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/EntityMixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/ExecuteCommand_1Mixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/ServerPlayerEntityMixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_1Mixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_2Mixin.java (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png (100%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/resources/fabric.mod.json (96%) rename {1.8.9/legacy-fabric-permissions-api-v1 => legacy-fabric-permissions-api-v1/1.8.9}/src/main/resources/legacy-fabric-permissions-api-v1.mixins.json (100%) create mode 100644 legacy-fabric-permissions-api-v1/common.gradle create mode 100644 legacy-fabric-permissions-api-v1/common/build.gradle create mode 100644 legacy-fabric-permissions-api-v1/common/gradle.properties rename {common/legacy-fabric-permissions-api-v1-common => legacy-fabric-permissions-api-v1/common}/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissibleCommandSource.java (100%) rename {common/legacy-fabric-permissions-api-v1-common => legacy-fabric-permissions-api-v1/common}/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissionsApiHolder.java (100%) rename {common/legacy-fabric-permissions-api-v1-common => legacy-fabric-permissions-api-v1/common}/src/main/java/net/legacyfabric/fabric/api/permission/v1/PlayerPermissionsApi.java (100%) rename {common/legacy-fabric-permissions-api-v1-common => legacy-fabric-permissions-api-v1/common}/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png (100%) rename {common/legacy-fabric-permissions-api-v1-common => legacy-fabric-permissions-api-v1/common}/src/main/resources/fabric.mod.json (96%) diff --git a/1.8.9/legacy-fabric-permissions-api-v1/build.gradle b/1.8.9/legacy-fabric-permissions-api-v1/build.gradle deleted file mode 100644 index 05a8cce1b..000000000 --- a/1.8.9/legacy-fabric-permissions-api-v1/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -version = getSubprojectVersion(project) - -moduleDependencies(project, [ - "common": [ - "legacy-fabric-api-base-common", - "legacy-fabric-permissions-api-v1-common" - ] -]) diff --git a/common/legacy-fabric-permissions-api-v1-common/build.gradle b/common/legacy-fabric-permissions-api-v1-common/build.gradle deleted file mode 100644 index 3ca3a9171..000000000 --- a/common/legacy-fabric-permissions-api-v1-common/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -version = getSubprojectVersion(project) - -moduleDependencies(project, [ - "common": [ - "legacy-fabric-api-base-common" - ] -]) diff --git a/legacy-fabric-permissions-api-v1/1.8.9/build.gradle b/legacy-fabric-permissions-api-v1/1.8.9/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/legacy-fabric-permissions-api-v1/1.8.9/gradle.properties b/legacy-fabric-permissions-api-v1/1.8.9/gradle.properties new file mode 100644 index 000000000..d523a75a0 --- /dev/null +++ b/legacy-fabric-permissions-api-v1/1.8.9/gradle.properties @@ -0,0 +1,2 @@ +minVersionIncluded=1.3 +maxVersionIncluded=1.12.2 diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandBlockExecutorMixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandStats_1Mixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandStats_1Mixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandStats_1Mixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/CommandStats_1Mixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ConsoleMixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ConsoleMixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ConsoleMixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ConsoleMixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/EntityMixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/EntityMixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/EntityMixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/EntityMixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ExecuteCommand_1Mixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ExecuteCommand_1Mixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ExecuteCommand_1Mixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ExecuteCommand_1Mixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ServerPlayerEntityMixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ServerPlayerEntityMixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/ServerPlayerEntityMixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/ServerPlayerEntityMixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_1Mixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_1Mixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_1Mixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_1Mixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_2Mixin.java b/legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_2Mixin.java similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_2Mixin.java rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/permission/SignBlockEntity_2Mixin.java diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png b/legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/fabric.mod.json b/legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/fabric.mod.json similarity index 96% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/fabric.mod.json rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/fabric.mod.json index 4f39ff17a..919f98876 100644 --- a/1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/fabric.mod.json +++ b/legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ ], "depends": { "fabricloader": ">=0.4.0", - "minecraft": "<=1.12.2" + "minecraft": "${minecraft_version}" }, "description": "Simple permission api", "mixins": [ diff --git a/1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/legacy-fabric-permissions-api-v1.mixins.json b/legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/legacy-fabric-permissions-api-v1.mixins.json similarity index 100% rename from 1.8.9/legacy-fabric-permissions-api-v1/src/main/resources/legacy-fabric-permissions-api-v1.mixins.json rename to legacy-fabric-permissions-api-v1/1.8.9/src/main/resources/legacy-fabric-permissions-api-v1.mixins.json diff --git a/legacy-fabric-permissions-api-v1/common.gradle b/legacy-fabric-permissions-api-v1/common.gradle new file mode 100644 index 000000000..f7bb5a4dd --- /dev/null +++ b/legacy-fabric-permissions-api-v1/common.gradle @@ -0,0 +1,3 @@ +moduleDependencies(project, [ + "legacy-fabric-api-base" +]) diff --git a/legacy-fabric-permissions-api-v1/common/build.gradle b/legacy-fabric-permissions-api-v1/common/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/legacy-fabric-permissions-api-v1/common/gradle.properties b/legacy-fabric-permissions-api-v1/common/gradle.properties new file mode 100644 index 000000000..d523a75a0 --- /dev/null +++ b/legacy-fabric-permissions-api-v1/common/gradle.properties @@ -0,0 +1,2 @@ +minVersionIncluded=1.3 +maxVersionIncluded=1.12.2 diff --git a/common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissibleCommandSource.java b/legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissibleCommandSource.java similarity index 100% rename from common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissibleCommandSource.java rename to legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissibleCommandSource.java diff --git a/common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissionsApiHolder.java b/legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissionsApiHolder.java similarity index 100% rename from common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissionsApiHolder.java rename to legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PermissionsApiHolder.java diff --git a/common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PlayerPermissionsApi.java b/legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PlayerPermissionsApi.java similarity index 100% rename from common/legacy-fabric-permissions-api-v1-common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PlayerPermissionsApi.java rename to legacy-fabric-permissions-api-v1/common/src/main/java/net/legacyfabric/fabric/api/permission/v1/PlayerPermissionsApi.java diff --git a/common/legacy-fabric-permissions-api-v1-common/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png b/legacy-fabric-permissions-api-v1/common/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png similarity index 100% rename from common/legacy-fabric-permissions-api-v1-common/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png rename to legacy-fabric-permissions-api-v1/common/src/main/resources/assets/legacy-fabric-permissions-api-v1/icon.png diff --git a/common/legacy-fabric-permissions-api-v1-common/src/main/resources/fabric.mod.json b/legacy-fabric-permissions-api-v1/common/src/main/resources/fabric.mod.json similarity index 96% rename from common/legacy-fabric-permissions-api-v1-common/src/main/resources/fabric.mod.json rename to legacy-fabric-permissions-api-v1/common/src/main/resources/fabric.mod.json index 56e69f958..ebf36e9a6 100644 --- a/common/legacy-fabric-permissions-api-v1-common/src/main/resources/fabric.mod.json +++ b/legacy-fabric-permissions-api-v1/common/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ ], "depends": { "fabricloader": ">=0.4.0", - "minecraft": "<=1.12.2" + "minecraft": "${minecraft_version}" }, "description": "Simple permission api", "mixins": [], diff --git a/settings.gradle b/settings.gradle index a5e541728..814910d87 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,6 +35,7 @@ loadProject("legacy-fabric-gamerule-api-v1") loadProject("legacy-fabric-item-groups-v1") loadProject("legacy-fabric-keybindings-api-v1") loadProject("legacy-fabric-networking-api-v1") +loadProject("legacy-fabric-permissions-api-v1") //include("common") //include("common:legacy-fabric-logger-api-v1")