From 16db0fe788a254465992dff91dc26f6e03a2f211 Mon Sep 17 00:00:00 2001 From: Eclipse Date: Tue, 14 Oct 2025 08:03:42 +0000 Subject: [PATCH] Create build-logic, main rainbow and client module --- build-logic/build.gradle.kts | 18 ++++++++++++++++++ build-logic/settings.gradle.kts | 7 +++++++ build-logic/src/main/kotlin/libs.kt | 6 ++++++ .../rainbow.base-conventions.gradle.kts | 2 +- .../rainbow.publish-conventions.gradle.kts | 0 client/build.gradle.kts | 3 +++ gradle/libs.versions.toml | 1 + rainbow/build.gradle.kts | 3 +++ .../java/org/geysermc/rainbow/CodecUtil.java | 0 .../java/org/geysermc/rainbow/KeyUtil.java | 0 .../org/geysermc/rainbow/PackConstants.java | 0 .../org/geysermc/rainbow/PackManager.java | 0 .../java/org/geysermc/rainbow/Rainbow.java | 0 .../accessor/ResolvedModelAccessor.java | 0 .../CommandSuggestionsArgumentType.java | 0 .../rainbow/command/PackGeneratorCommand.java | 0 .../CachingStreamResourceContainer.java | 0 .../creative/ImmutableResourceContainer.java | 0 .../creative/ImmutableResourcePack.java | 0 .../MinecraftCreativeResourcePack.java | 0 .../creative/StreamResourceContainer.java | 0 .../rainbow/mapper/CustomItemProvider.java | 0 .../rainbow/mapper/InventoryMapper.java | 0 .../mapper/ItemSuggestionProvider.java | 0 .../geysermc/rainbow/mapper/PackMapper.java | 0 .../rainbow/mapping/BedrockItemConsumer.java | 0 .../rainbow/mapping/BedrockItemMapper.java | 0 .../geysermc/rainbow/mapping/PackContext.java | 0 .../mapping/animation/AnimationMapper.java | 0 .../animation/BedrockAnimationContext.java | 0 .../mapping/attachable/AttachableMapper.java | 0 .../geometry/BedrockGeometryContext.java | 0 .../mapping/geometry/GeometryMapper.java | 0 .../mapping/geometry/GeometryRenderer.java | 0 .../mapping/geyser/GeyserBaseDefinition.java | 0 .../mapping/geyser/GeyserGroupDefinition.java | 0 .../mapping/geyser/GeyserItemDefinition.java | 0 .../geyser/GeyserLegacyDefinition.java | 0 .../rainbow/mapping/geyser/GeyserMapping.java | 0 .../mapping/geyser/GeyserMappings.java | 0 .../geyser/GeyserSingleDefinition.java | 0 .../predicate/GeyserConditionPredicate.java | 0 .../predicate/GeyserMatchPredicate.java | 0 .../geyser/predicate/GeyserPredicate.java | 0 .../GeyserRangeDispatchPredicate.java | 0 .../mixin/EntityRenderDispatcherAccessor.java | 0 .../mixin/GuiItemRenderStateMixin.java | 0 .../mixin/LateBoundIdMapperAccessor.java | 0 .../rainbow/mixin/ModelManagerMixin.java | 0 .../PictureInPictureRendererAccessor.java | 0 .../mixin/PictureInPictureRendererMixin.java | 0 .../mixin/RangeSelectItemModelAccessor.java | 0 .../rainbow/mixin/SplashRendererAccessor.java | 0 .../rainbow/mixin/TextureSlotsAccessor.java | 0 .../geysermc/rainbow/pack/BedrockItem.java | 0 .../geysermc/rainbow/pack/BedrockPack.java | 0 .../rainbow/pack/BedrockTextureAtlas.java | 0 .../rainbow/pack/BedrockTextures.java | 0 .../geysermc/rainbow/pack/BedrockVersion.java | 0 .../geysermc/rainbow/pack/PackManifest.java | 0 .../pack/animation/BedrockAnimation.java | 0 .../pack/attachable/BedrockAttachable.java | 0 .../pack/attachable/VanillaGeometries.java | 0 .../pack/attachable/VanillaMaterials.java | 0 .../attachable/VanillaRenderControllers.java | 0 .../pack/attachable/VanillaTextures.java | 0 .../pack/geometry/BedrockGeometry.java | 0 .../render/PictureInPictureCopyRenderer.java | 0 .../main/resources/assets/rainbow/icon.png | Bin .../resources/assets/rainbow/lang/en_us.json | 0 .../src}/main/resources/fabric.mod.json | 0 .../src}/main/resources/rainbow.mixins.json | 0 settings.gradle.kts | 6 +++++- 73 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 build-logic/build.gradle.kts create mode 100644 build-logic/settings.gradle.kts create mode 100644 build-logic/src/main/kotlin/libs.kt rename build.gradle.kts => build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts (98%) create mode 100644 build-logic/src/main/kotlin/rainbow.publish-conventions.gradle.kts create mode 100644 client/build.gradle.kts create mode 100644 rainbow/build.gradle.kts rename {src => rainbow/src}/main/java/org/geysermc/rainbow/CodecUtil.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/KeyUtil.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/PackConstants.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/PackManager.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/Rainbow.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/creative/CachingStreamResourceContainer.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/creative/ImmutableResourceContainer.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/creative/ImmutableResourcePack.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/creative/MinecraftCreativeResourcePack.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/creative/StreamResourceContainer.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapper/PackMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/PackContext.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/LateBoundIdMapperAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/RangeSelectItemModelAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/mixin/TextureSlotsAccessor.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/BedrockItem.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/BedrockPack.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/BedrockTextures.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/BedrockVersion.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/PackManifest.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java (100%) rename {src => rainbow/src}/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java (100%) rename {src => rainbow/src}/main/resources/assets/rainbow/icon.png (100%) rename {src => rainbow/src}/main/resources/assets/rainbow/lang/en_us.json (100%) rename {src => rainbow/src}/main/resources/fabric.mod.json (100%) rename {src => rainbow/src}/main/resources/rainbow.mixins.json (100%) diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts new file mode 100644 index 0000000..3c6afdc --- /dev/null +++ b/build-logic/build.gradle.kts @@ -0,0 +1,18 @@ +plugins { + `kotlin-dsl` +} + +repositories { + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } + gradlePluginPortal() +} + +dependencies { + // Very ugly... https://github.com/gradle/gradle/issues/15383 + implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) + + implementation(libs.fabric.loom) +} diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts new file mode 100644 index 0000000..b5a0fab --- /dev/null +++ b/build-logic/settings.gradle.kts @@ -0,0 +1,7 @@ +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/build-logic/src/main/kotlin/libs.kt b/build-logic/src/main/kotlin/libs.kt new file mode 100644 index 0000000..1214d49 --- /dev/null +++ b/build-logic/src/main/kotlin/libs.kt @@ -0,0 +1,6 @@ +import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.Project +import org.gradle.kotlin.dsl.getByType + +val Project.libs: LibrariesForLibs + get() = rootProject.extensions.getByType() diff --git a/build.gradle.kts b/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts similarity index 98% rename from build.gradle.kts rename to build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts index 53d18b5..2eb4e5a 100644 --- a/build.gradle.kts +++ b/build-logic/src/main/kotlin/rainbow.base-conventions.gradle.kts @@ -1,5 +1,5 @@ plugins { - alias(libs.plugins.fabric.loom) + id("fabric-loom") } version = properties["mod_version"]!! as String diff --git a/build-logic/src/main/kotlin/rainbow.publish-conventions.gradle.kts b/build-logic/src/main/kotlin/rainbow.publish-conventions.gradle.kts new file mode 100644 index 0000000..e69de29 diff --git a/client/build.gradle.kts b/client/build.gradle.kts new file mode 100644 index 0000000..def7c69 --- /dev/null +++ b/client/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("rainbow.base-conventions") +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2c56843..cfbb800 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ packconverter = "3.4.1-20251013.173215-13" minecraft = {group = "com.mojang", name = "minecraft", version.ref = "minecraft"} parchment = {group = "org.parchmentmc.data", name = "parchment-1.21.10", version.ref = "parchment"} +fabric-loom = {group = "net.fabricmc", name = "fabric-loom", version.ref = "fabric-loom"} fabric-loader = {group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader"} fabric-api = {group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api"} diff --git a/rainbow/build.gradle.kts b/rainbow/build.gradle.kts new file mode 100644 index 0000000..def7c69 --- /dev/null +++ b/rainbow/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("rainbow.base-conventions") +} diff --git a/src/main/java/org/geysermc/rainbow/CodecUtil.java b/rainbow/src/main/java/org/geysermc/rainbow/CodecUtil.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/CodecUtil.java rename to rainbow/src/main/java/org/geysermc/rainbow/CodecUtil.java diff --git a/src/main/java/org/geysermc/rainbow/KeyUtil.java b/rainbow/src/main/java/org/geysermc/rainbow/KeyUtil.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/KeyUtil.java rename to rainbow/src/main/java/org/geysermc/rainbow/KeyUtil.java diff --git a/src/main/java/org/geysermc/rainbow/PackConstants.java b/rainbow/src/main/java/org/geysermc/rainbow/PackConstants.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/PackConstants.java rename to rainbow/src/main/java/org/geysermc/rainbow/PackConstants.java diff --git a/src/main/java/org/geysermc/rainbow/PackManager.java b/rainbow/src/main/java/org/geysermc/rainbow/PackManager.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/PackManager.java rename to rainbow/src/main/java/org/geysermc/rainbow/PackManager.java diff --git a/src/main/java/org/geysermc/rainbow/Rainbow.java b/rainbow/src/main/java/org/geysermc/rainbow/Rainbow.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/Rainbow.java rename to rainbow/src/main/java/org/geysermc/rainbow/Rainbow.java diff --git a/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/accessor/ResolvedModelAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java b/rainbow/src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java rename to rainbow/src/main/java/org/geysermc/rainbow/command/CommandSuggestionsArgumentType.java diff --git a/src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java b/rainbow/src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java rename to rainbow/src/main/java/org/geysermc/rainbow/command/PackGeneratorCommand.java diff --git a/src/main/java/org/geysermc/rainbow/creative/CachingStreamResourceContainer.java b/rainbow/src/main/java/org/geysermc/rainbow/creative/CachingStreamResourceContainer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/creative/CachingStreamResourceContainer.java rename to rainbow/src/main/java/org/geysermc/rainbow/creative/CachingStreamResourceContainer.java diff --git a/src/main/java/org/geysermc/rainbow/creative/ImmutableResourceContainer.java b/rainbow/src/main/java/org/geysermc/rainbow/creative/ImmutableResourceContainer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/creative/ImmutableResourceContainer.java rename to rainbow/src/main/java/org/geysermc/rainbow/creative/ImmutableResourceContainer.java diff --git a/src/main/java/org/geysermc/rainbow/creative/ImmutableResourcePack.java b/rainbow/src/main/java/org/geysermc/rainbow/creative/ImmutableResourcePack.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/creative/ImmutableResourcePack.java rename to rainbow/src/main/java/org/geysermc/rainbow/creative/ImmutableResourcePack.java diff --git a/src/main/java/org/geysermc/rainbow/creative/MinecraftCreativeResourcePack.java b/rainbow/src/main/java/org/geysermc/rainbow/creative/MinecraftCreativeResourcePack.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/creative/MinecraftCreativeResourcePack.java rename to rainbow/src/main/java/org/geysermc/rainbow/creative/MinecraftCreativeResourcePack.java diff --git a/src/main/java/org/geysermc/rainbow/creative/StreamResourceContainer.java b/rainbow/src/main/java/org/geysermc/rainbow/creative/StreamResourceContainer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/creative/StreamResourceContainer.java rename to rainbow/src/main/java/org/geysermc/rainbow/creative/StreamResourceContainer.java diff --git a/src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java b/rainbow/src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapper/CustomItemProvider.java diff --git a/src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapper/InventoryMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java b/rainbow/src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapper/ItemSuggestionProvider.java diff --git a/src/main/java/org/geysermc/rainbow/mapper/PackMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapper/PackMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapper/PackMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapper/PackMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemConsumer.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/BedrockItemMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/PackContext.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/PackContext.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/PackContext.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/animation/BedrockAnimationContext.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryRenderer.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserBaseDefinition.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserGroupDefinition.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserItemDefinition.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserLegacyDefinition.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMapping.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserMappings.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/GeyserSingleDefinition.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserConditionPredicate.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserMatchPredicate.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserPredicate.java diff --git a/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java b/rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java rename to rainbow/src/main/java/org/geysermc/rainbow/mapping/geyser/predicate/GeyserRangeDispatchPredicate.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/EntityRenderDispatcherAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/GuiItemRenderStateMixin.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/LateBoundIdMapperAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/LateBoundIdMapperAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/LateBoundIdMapperAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/LateBoundIdMapperAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/ModelManagerMixin.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/PictureInPictureRendererMixin.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/RangeSelectItemModelAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/RangeSelectItemModelAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/RangeSelectItemModelAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/RangeSelectItemModelAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/SplashRendererAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/mixin/TextureSlotsAccessor.java b/rainbow/src/main/java/org/geysermc/rainbow/mixin/TextureSlotsAccessor.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/mixin/TextureSlotsAccessor.java rename to rainbow/src/main/java/org/geysermc/rainbow/mixin/TextureSlotsAccessor.java diff --git a/src/main/java/org/geysermc/rainbow/pack/BedrockItem.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockItem.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/BedrockItem.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockItem.java diff --git a/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/BedrockPack.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java diff --git a/src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockTextureAtlas.java diff --git a/src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockTextures.java diff --git a/src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockVersion.java diff --git a/src/main/java/org/geysermc/rainbow/pack/PackManifest.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/PackManifest.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/PackManifest.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/PackManifest.java diff --git a/src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/animation/BedrockAnimation.java diff --git a/src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/BedrockAttachable.java diff --git a/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaGeometries.java diff --git a/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaMaterials.java diff --git a/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaRenderControllers.java diff --git a/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/attachable/VanillaTextures.java diff --git a/src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java b/rainbow/src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java rename to rainbow/src/main/java/org/geysermc/rainbow/pack/geometry/BedrockGeometry.java diff --git a/src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java b/rainbow/src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java similarity index 100% rename from src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java rename to rainbow/src/main/java/org/geysermc/rainbow/render/PictureInPictureCopyRenderer.java diff --git a/src/main/resources/assets/rainbow/icon.png b/rainbow/src/main/resources/assets/rainbow/icon.png similarity index 100% rename from src/main/resources/assets/rainbow/icon.png rename to rainbow/src/main/resources/assets/rainbow/icon.png diff --git a/src/main/resources/assets/rainbow/lang/en_us.json b/rainbow/src/main/resources/assets/rainbow/lang/en_us.json similarity index 100% rename from src/main/resources/assets/rainbow/lang/en_us.json rename to rainbow/src/main/resources/assets/rainbow/lang/en_us.json diff --git a/src/main/resources/fabric.mod.json b/rainbow/src/main/resources/fabric.mod.json similarity index 100% rename from src/main/resources/fabric.mod.json rename to rainbow/src/main/resources/fabric.mod.json diff --git a/src/main/resources/rainbow.mixins.json b/rainbow/src/main/resources/rainbow.mixins.json similarity index 100% rename from src/main/resources/rainbow.mixins.json rename to rainbow/src/main/resources/rainbow.mixins.json diff --git a/settings.gradle.kts b/settings.gradle.kts index 22a0042..bc119e5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,10 @@ pluginManagement { } gradlePluginPortal() } + includeBuild("build-logic") } -rootProject.name = "Rainbow" +include(":rainbow") +include(":client") + +rootProject.name = "rainbow-parent"