From 048c6a5c641c746693f913d87440c669318c4c46 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Thu, 8 Feb 2024 10:57:11 +0100 Subject: [PATCH] Port legacy-fabric-item-groups-v1 --- 1.12.2/legacy-fabric-item-groups-v1/build.gradle | 7 ------- 1.8.9/legacy-fabric-item-groups-v1/build.gradle | 7 ------- .../build.gradle | 7 ------- legacy-fabric-item-groups-v1/1.12.2/build.gradle | 0 .../1.12.2/gradle.properties | 2 ++ .../fabric/impl/item/group/FabricItemGroup.java | 0 .../fabric/mixin/item/group/ItemGroupMixin.java | 0 .../main/resources/assets/legacy-fabric/icon.png | Bin .../legacy-fabric/textures/gui/creative_buttons.png | Bin .../1.12.2}/src/main/resources/fabric.mod.json | 2 +- .../legacy-fabric-item-groups-v1.mixins.json | 0 .../fabric/test/item/group/ItemGroupTest.java | 0 .../assets/legacy-fabric-api/lang/en_us.lang | 0 .../1.12.2}/src/testmod/resources/fabric.mod.json | 2 +- legacy-fabric-item-groups-v1/1.8.9/build.gradle | 0 .../1.8.9/gradle.properties | 2 ++ .../fabric/impl/item/group/FabricItemGroup.java | 0 .../fabric/mixin/item/group/ItemGroupMixin.java | 0 .../main/resources/assets/legacy-fabric/icon.png | Bin .../resources/assets/legacy-fabric/lang/en_US.lang | 0 .../resources/assets/legacy-fabric/lang/ru_RU.lang | 0 .../legacy-fabric/textures/gui/creative_buttons.png | Bin .../1.8.9}/src/main/resources/fabric.mod.json | 2 +- .../legacy-fabric-item-groups-v1.mixins.json | 0 .../fabric/test/item/group/ItemGroupTest.java | 0 .../assets/legacy-fabric-api/lang/en_US.lang | 0 .../1.8.9}/src/testmod/resources/fabric.mod.json | 2 +- legacy-fabric-item-groups-v1/common.gradle | 3 +++ legacy-fabric-item-groups-v1/common/build.gradle | 0 .../common/gradle.properties | 2 ++ .../client/itemgroup/FabricItemGroupBuilder.java | 0 .../impl/item/group/CreativeGuiExtensions.java | 0 .../item/group/FabricCreativeGuiComponents.java | 0 .../fabric/impl/item/group/ItemGroupExtensions.java | 0 .../fabric/impl/item/group/ScreenAccessor.java | 0 .../fabric/mixin/item/group/MixinItemGroup.java | 0 .../client/MixinCreativePlayerInventoryGui.java | 0 .../mixin/item/group/client/MixinItemGroup.java | 0 .../fabric/mixin/item/group/client/MixinScreen.java | 0 .../main/resources/assets/legacy-fabric/icon.png | Bin .../resources/assets/legacy-fabric/lang/en_us.json | 0 .../resources/assets/legacy-fabric/lang/ru_ru.json | 0 .../legacy-fabric/textures/gui/creative_buttons.png | Bin .../common}/src/main/resources/fabric.mod.json | 2 +- .../legacy-fabric-item-groups-v1-common.mixins.json | 0 settings.gradle | 1 + 46 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 1.12.2/legacy-fabric-item-groups-v1/build.gradle delete mode 100644 1.8.9/legacy-fabric-item-groups-v1/build.gradle delete mode 100644 common/legacy-fabric-item-groups-v1-common/build.gradle create mode 100644 legacy-fabric-item-groups-v1/1.12.2/build.gradle create mode 100644 legacy-fabric-item-groups-v1/1.12.2/gradle.properties rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/resources/assets/legacy-fabric/icon.png (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/resources/fabric.mod.json (96%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/main/resources/legacy-fabric-item-groups-v1.mixins.json (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/testmod/resources/assets/legacy-fabric-api/lang/en_us.lang (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.12.2}/src/testmod/resources/fabric.mod.json (86%) create mode 100644 legacy-fabric-item-groups-v1/1.8.9/build.gradle create mode 100644 legacy-fabric-item-groups-v1/1.8.9/gradle.properties rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/assets/legacy-fabric/icon.png (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/assets/legacy-fabric/lang/en_US.lang (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/assets/legacy-fabric/lang/ru_RU.lang (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png (100%) rename {1.12.2/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/fabric.mod.json (96%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/main/resources/legacy-fabric-item-groups-v1.mixins.json (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/testmod/resources/assets/legacy-fabric-api/lang/en_US.lang (100%) rename {1.8.9/legacy-fabric-item-groups-v1 => legacy-fabric-item-groups-v1/1.8.9}/src/testmod/resources/fabric.mod.json (86%) create mode 100644 legacy-fabric-item-groups-v1/common.gradle create mode 100644 legacy-fabric-item-groups-v1/common/build.gradle create mode 100644 legacy-fabric-item-groups-v1/common/gradle.properties rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/api/client/itemgroup/FabricItemGroupBuilder.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/impl/item/group/CreativeGuiExtensions.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/impl/item/group/ItemGroupExtensions.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/impl/item/group/ScreenAccessor.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/mixin/item/group/MixinItemGroup.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinItemGroup.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/assets/legacy-fabric/icon.png (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/assets/legacy-fabric/lang/en_us.json (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/assets/legacy-fabric/lang/ru_ru.json (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png (100%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/fabric.mod.json (96%) rename {common/legacy-fabric-item-groups-v1-common => legacy-fabric-item-groups-v1/common}/src/main/resources/legacy-fabric-item-groups-v1-common.mixins.json (100%) diff --git a/1.12.2/legacy-fabric-item-groups-v1/build.gradle b/1.12.2/legacy-fabric-item-groups-v1/build.gradle deleted file mode 100644 index f4df0b360..000000000 --- a/1.12.2/legacy-fabric-item-groups-v1/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -version = getSubprojectVersion(project) - -moduleDependencies(project, [ - "common": [ - "legacy-fabric-item-groups-v1-common" - ] -]) diff --git a/1.8.9/legacy-fabric-item-groups-v1/build.gradle b/1.8.9/legacy-fabric-item-groups-v1/build.gradle deleted file mode 100644 index f4df0b360..000000000 --- a/1.8.9/legacy-fabric-item-groups-v1/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -version = getSubprojectVersion(project) - -moduleDependencies(project, [ - "common": [ - "legacy-fabric-item-groups-v1-common" - ] -]) diff --git a/common/legacy-fabric-item-groups-v1-common/build.gradle b/common/legacy-fabric-item-groups-v1-common/build.gradle deleted file mode 100644 index 3ca3a9171..000000000 --- a/common/legacy-fabric-item-groups-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-item-groups-v1/1.12.2/build.gradle b/legacy-fabric-item-groups-v1/1.12.2/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/legacy-fabric-item-groups-v1/1.12.2/gradle.properties b/legacy-fabric-item-groups-v1/1.12.2/gradle.properties new file mode 100644 index 000000000..a104a3a86 --- /dev/null +++ b/legacy-fabric-item-groups-v1/1.12.2/gradle.properties @@ -0,0 +1,2 @@ +minVersionExcluded=1.10.2 +maxVersionIncluded=1.12.2 diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java b/legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java rename to legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java b/legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java rename to legacy-fabric-item-groups-v1/1.12.2/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/icon.png b/legacy-fabric-item-groups-v1/1.12.2/src/main/resources/assets/legacy-fabric/icon.png similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/icon.png rename to legacy-fabric-item-groups-v1/1.12.2/src/main/resources/assets/legacy-fabric/icon.png diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png b/legacy-fabric-item-groups-v1/1.12.2/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png rename to legacy-fabric-item-groups-v1/1.12.2/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json b/legacy-fabric-item-groups-v1/1.12.2/src/main/resources/fabric.mod.json similarity index 96% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json rename to legacy-fabric-item-groups-v1/1.12.2/src/main/resources/fabric.mod.json index db59b6cf5..ab1f44bd4 100644 --- a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json +++ b/legacy-fabric-item-groups-v1/1.12.2/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ ], "description": "Advanced item groups.", "depends": { - "minecraft": "<=1.10.2" + "minecraft": "${minecraft_version}" }, "custom": { "modmenu": { diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/resources/legacy-fabric-item-groups-v1.mixins.json b/legacy-fabric-item-groups-v1/1.12.2/src/main/resources/legacy-fabric-item-groups-v1.mixins.json similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/resources/legacy-fabric-item-groups-v1.mixins.json rename to legacy-fabric-item-groups-v1/1.12.2/src/main/resources/legacy-fabric-item-groups-v1.mixins.json diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java b/legacy-fabric-item-groups-v1/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java rename to legacy-fabric-item-groups-v1/1.12.2/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/testmod/resources/assets/legacy-fabric-api/lang/en_us.lang b/legacy-fabric-item-groups-v1/1.12.2/src/testmod/resources/assets/legacy-fabric-api/lang/en_us.lang similarity index 100% rename from 1.12.2/legacy-fabric-item-groups-v1/src/testmod/resources/assets/legacy-fabric-api/lang/en_us.lang rename to legacy-fabric-item-groups-v1/1.12.2/src/testmod/resources/assets/legacy-fabric-api/lang/en_us.lang diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json b/legacy-fabric-item-groups-v1/1.12.2/src/testmod/resources/fabric.mod.json similarity index 86% rename from 1.12.2/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json rename to legacy-fabric-item-groups-v1/1.12.2/src/testmod/resources/fabric.mod.json index 643330d37..ffa7dbef4 100644 --- a/1.12.2/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json +++ b/legacy-fabric-item-groups-v1/1.12.2/src/testmod/resources/fabric.mod.json @@ -9,6 +9,6 @@ ] }, "depends": { - "minecraft": ">1.10.2 <=1.12.2" + "minecraft": "${minecraft_version}" } } diff --git a/legacy-fabric-item-groups-v1/1.8.9/build.gradle b/legacy-fabric-item-groups-v1/1.8.9/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/legacy-fabric-item-groups-v1/1.8.9/gradle.properties b/legacy-fabric-item-groups-v1/1.8.9/gradle.properties new file mode 100644 index 000000000..7a09d76fd --- /dev/null +++ b/legacy-fabric-item-groups-v1/1.8.9/gradle.properties @@ -0,0 +1,2 @@ +minVersionIncluded=1.3 +maxVersionIncluded=1.10.2 diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java b/legacy-fabric-item-groups-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java rename to legacy-fabric-item-groups-v1/1.8.9/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricItemGroup.java diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java b/legacy-fabric-item-groups-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java rename to legacy-fabric-item-groups-v1/1.8.9/src/main/java/net/legacyfabric/fabric/mixin/item/group/ItemGroupMixin.java diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/icon.png b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/icon.png similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/icon.png rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/icon.png diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/lang/en_US.lang b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/lang/en_US.lang similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/lang/en_US.lang rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/lang/en_US.lang diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/lang/ru_RU.lang b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/lang/ru_RU.lang similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/lang/ru_RU.lang rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/lang/ru_RU.lang diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png diff --git a/1.12.2/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/fabric.mod.json similarity index 96% rename from 1.12.2/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/fabric.mod.json index e36a99033..ab1f44bd4 100644 --- a/1.12.2/legacy-fabric-item-groups-v1/src/main/resources/fabric.mod.json +++ b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ ], "description": "Advanced item groups.", "depends": { - "minecraft": ">1.10.2 <=1.12.2" + "minecraft": "${minecraft_version}" }, "custom": { "modmenu": { diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/main/resources/legacy-fabric-item-groups-v1.mixins.json b/legacy-fabric-item-groups-v1/1.8.9/src/main/resources/legacy-fabric-item-groups-v1.mixins.json similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/main/resources/legacy-fabric-item-groups-v1.mixins.json rename to legacy-fabric-item-groups-v1/1.8.9/src/main/resources/legacy-fabric-item-groups-v1.mixins.json diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java b/legacy-fabric-item-groups-v1/1.8.9/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java rename to legacy-fabric-item-groups-v1/1.8.9/src/testmod/java/net/legacyfabric/fabric/test/item/group/ItemGroupTest.java diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/testmod/resources/assets/legacy-fabric-api/lang/en_US.lang b/legacy-fabric-item-groups-v1/1.8.9/src/testmod/resources/assets/legacy-fabric-api/lang/en_US.lang similarity index 100% rename from 1.8.9/legacy-fabric-item-groups-v1/src/testmod/resources/assets/legacy-fabric-api/lang/en_US.lang rename to legacy-fabric-item-groups-v1/1.8.9/src/testmod/resources/assets/legacy-fabric-api/lang/en_US.lang diff --git a/1.8.9/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json b/legacy-fabric-item-groups-v1/1.8.9/src/testmod/resources/fabric.mod.json similarity index 86% rename from 1.8.9/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json rename to legacy-fabric-item-groups-v1/1.8.9/src/testmod/resources/fabric.mod.json index ffef2963f..ffa7dbef4 100644 --- a/1.8.9/legacy-fabric-item-groups-v1/src/testmod/resources/fabric.mod.json +++ b/legacy-fabric-item-groups-v1/1.8.9/src/testmod/resources/fabric.mod.json @@ -9,6 +9,6 @@ ] }, "depends": { - "minecraft": "<=1.10.2" + "minecraft": "${minecraft_version}" } } diff --git a/legacy-fabric-item-groups-v1/common.gradle b/legacy-fabric-item-groups-v1/common.gradle new file mode 100644 index 000000000..f7bb5a4dd --- /dev/null +++ b/legacy-fabric-item-groups-v1/common.gradle @@ -0,0 +1,3 @@ +moduleDependencies(project, [ + "legacy-fabric-api-base" +]) diff --git a/legacy-fabric-item-groups-v1/common/build.gradle b/legacy-fabric-item-groups-v1/common/build.gradle new file mode 100644 index 000000000..e69de29bb diff --git a/legacy-fabric-item-groups-v1/common/gradle.properties b/legacy-fabric-item-groups-v1/common/gradle.properties new file mode 100644 index 000000000..d523a75a0 --- /dev/null +++ b/legacy-fabric-item-groups-v1/common/gradle.properties @@ -0,0 +1,2 @@ +minVersionIncluded=1.3 +maxVersionIncluded=1.12.2 diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/api/client/itemgroup/FabricItemGroupBuilder.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/api/client/itemgroup/FabricItemGroupBuilder.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/api/client/itemgroup/FabricItemGroupBuilder.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/api/client/itemgroup/FabricItemGroupBuilder.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/CreativeGuiExtensions.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/CreativeGuiExtensions.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/CreativeGuiExtensions.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/CreativeGuiExtensions.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/ItemGroupExtensions.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/ItemGroupExtensions.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/ItemGroupExtensions.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/ItemGroupExtensions.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/ScreenAccessor.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/ScreenAccessor.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/ScreenAccessor.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/impl/item/group/ScreenAccessor.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/MixinItemGroup.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/MixinItemGroup.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/MixinItemGroup.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/MixinItemGroup.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinItemGroup.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinItemGroup.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinItemGroup.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinItemGroup.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java b/legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java rename to legacy-fabric-item-groups-v1/common/src/main/java/net/legacyfabric/fabric/mixin/item/group/client/MixinScreen.java diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/icon.png b/legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/icon.png similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/icon.png rename to legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/icon.png diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/lang/en_us.json b/legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/lang/en_us.json similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/lang/en_us.json rename to legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/lang/en_us.json diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/lang/ru_ru.json b/legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/lang/ru_ru.json similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/lang/ru_ru.json rename to legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/lang/ru_ru.json diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png b/legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png rename to legacy-fabric-item-groups-v1/common/src/main/resources/assets/legacy-fabric/textures/gui/creative_buttons.png diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/fabric.mod.json b/legacy-fabric-item-groups-v1/common/src/main/resources/fabric.mod.json similarity index 96% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/fabric.mod.json rename to legacy-fabric-item-groups-v1/common/src/main/resources/fabric.mod.json index fdbb69eed..acdcdd0af 100644 --- a/common/legacy-fabric-item-groups-v1-common/src/main/resources/fabric.mod.json +++ b/legacy-fabric-item-groups-v1/common/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ ], "description": "Advanced item groups.", "depends": { - "minecraft": ">=1.3 <=1.12.2" + "minecraft": "${minecraft_version}" }, "custom": { "modmenu": { diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/resources/legacy-fabric-item-groups-v1-common.mixins.json b/legacy-fabric-item-groups-v1/common/src/main/resources/legacy-fabric-item-groups-v1-common.mixins.json similarity index 100% rename from common/legacy-fabric-item-groups-v1-common/src/main/resources/legacy-fabric-item-groups-v1-common.mixins.json rename to legacy-fabric-item-groups-v1/common/src/main/resources/legacy-fabric-item-groups-v1-common.mixins.json diff --git a/settings.gradle b/settings.gradle index 9c3678417..821735faf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,6 +32,7 @@ loadProject("legacy-fabric-lifecycle-events-v1") loadProject("legacy-fabric-command-api-v1") loadProject("legacy-fabric-entity-events-v1") loadProject("legacy-fabric-gamerule-api-v1") +loadProject("legacy-fabric-item-groups-v1") //include("common") //include("common:legacy-fabric-logger-api-v1")