From 0f2456296cd598afd425644f736ca08314a62904 Mon Sep 17 00:00:00 2001 From: Anastasia Calico Date: Mon, 21 Sep 2026 01:53:08 +1000 Subject: [PATCH] refactor!: Migrate group to `org.vulpixel`. --- .../config_extensions/gradle/ModPlatform.kt | 2 +- .../config_extensions/gradle/Properties.kt | 46 ++++++++++-------- .../gradle/base/api.gradle.kts | 21 ++++++-- .../gradle/base/java.gradle.kts | 31 +++++++----- .../gradle/base/merge.gradle.kts | 34 ++++++++++--- .../gradle/base/publish.gradle.kts | 13 +++-- .../gradle/base/repositories.gradle.kts | 7 ++- .../gradle/base/root.gradle.kts | 8 +-- .../gradle/platform/fabric.gradle.kts | 18 +++++-- .../gradle/platform/loader.gradle.kts | 22 ++++++--- .../gradle/platform/neoforge.gradle.kts | 11 +++-- .../gradle/platform/xplat.gradle.kts | 29 +++++++---- gamerules/fabric/build.gradle.kts | 5 +- ...nhouseConfigExtensionsGameRulesFabric.java | 14 +++--- ...ConfigExtensionsGameRulesClientFabric.java | 6 +-- .../fabric/impl/client}/package-info.java | 2 +- ...essor_AbstractGameRulesScreenRuleList.java | 4 +- ...ixin_AbstractGameRulesScreenRuleList1.java | 24 ++++----- .../fabric/impl/mixin/Mixin_GameRuleType.java | 4 +- .../gamerules/fabric/impl}/package-info.java | 2 +- ...tensionsGameRulesPlatformHelperFabric.java | 10 ++-- .../fabric/impl/platform/package-info.java | 14 ++++++ ... config_extensions_gamerules.classtweaker} | 0 ...ig_extensions_gamerules.fabric.mixins.json | 17 +++++++ .../fabric/src/main/resources/fabric.mod.json | 4 +- ...ig_extensions_gamerules.fabric.mixins.json | 17 ------- ...onfigExtensionsGameRulesTestmodFabric.java | 4 +- ...sGameRulesTestmodPlatformHelperFabric.java | 4 +- .../src/testmod/resources/fabric.mod.json | 2 +- gamerules/neoforge/build.gradle.kts | 2 +- .../neoforge/impl/platform/package-info.java | 14 ------ ...ouseConfigExtensionsGameRulesNeoForge.java | 16 +++--- ...nfigExtensionsGameRulesClientNeoForge.java | 24 +++++---- .../Accessor_GameRuleEntryFactoryManager.java | 4 +- ...Mixin_AbstractGameRulesScreenRuleList.java | 6 +-- ...ixin_AbstractGameRulesScreenRuleList1.java | 8 +-- .../neoforge/impl}/package-info.java | 3 +- ...nsionsGameRulesPlatformHelperNeoForge.java | 12 ++--- .../neoforge/impl/platform}/package-info.java | 2 +- ...es.cfg => config_extensions_gamerules.cfg} | 0 ..._extensions_gamerules.neoforge.mixins.json | 19 ++++++++ ...onfig_extensions_gamerules_extensions.json | 10 ++++ ..._extensions_gamerules.neoforge.mixins.json | 19 -------- ...onfig_extensions_gamerules_extensions.json | 10 ---- ...figExtensionsGameRulesTestmodNeoForge.java | 4 +- ...ameRulesTestmodPlatformHelperNeoForge.java | 4 +- gamerules/xplat/build.gradle.kts | 25 +--------- .../impl/client/network/package-info.java | 14 ------ .../client/screen/gamerule/package-info.java | 14 ------ .../impl/client/screen/package-info.java | 14 ------ .../gamerules/impl/network/package-info.java | 14 ------ .../api/v1/gamerule/ViaConfigGameRule.java | 18 +++---- .../api/v1/gamerule/package-info.java | 2 +- .../GreenhouseConfigExtensionsGameRules.java | 12 ++--- .../gamerules/impl/NullableCodec.java | 6 +-- ...nhouseConfigExtensionsGameRulesClient.java | 2 +- ...nhouseConfigClientboundPacketHandlers.java | 18 +++---- .../impl/client/network/package-info.java | 14 ++++++ .../gamerules/impl/client}/package-info.java | 3 +- .../gamerule/ViaConfigGameRuleEntry.java | 18 +++---- .../client/screen/gamerule}/package-info.java | 2 +- .../impl/client/screen}/package-info.java | 2 +- .../impl/command/ViaConfigArgumentType.java | 4 +- .../command/ViaConfigArgumentTypeInfo.java | 4 +- .../gamerules/impl/command/package-info.java | 14 ++++++ .../Duck_ViaConfigGameRuleTypeVisitor.java | 6 +-- .../impl/duck/Duck_ViaConfigGameRules.java | 4 +- .../gamerules/impl/duck/package-info.java | 14 ++++++ .../impl/mixin/Accessor_GameRule.java | 6 +-- .../impl/mixin/Mixin_GameRuleCommand.java | 28 +++++------ .../gamerules/impl/mixin/Mixin_GameRules.java | 14 +++--- .../Mixin_ServerGamePacketListenerImpl.java | 14 +++--- .../Accessor_AbstractGameRulesScreen.java | 4 +- .../Accessor_InWorldGameRulesScreen.java | 6 +-- ...ixin_AbstractGameRulesScreenRuleList1.java | 8 +-- .../client/Mixin_InWorldGameRulesScreen.java | 22 ++++----- ...onsGameRulesServerboundPacketHandlers.java | 10 ++-- ...ConfigValueGameRulesClientboundPacket.java | 4 +- .../gamerules/impl/network/package-info.java | 14 ++++++ ...ConfigValueGameRulesServerboundPacket.java | 4 +- .../gamerules/impl/package-info.java | 2 +- ...onfigExtensionsGameRulesHelperLoaders.java | 8 +-- ...nfigExtensionsGameRulesPlatformHelper.java | 2 +- .../gamerules/impl}/platform/Platform.java | 2 +- .../gamerules/impl/platform/package-info.java | 14 ++++++ .../lang/en_us.json | 6 +++ .../gamerule/config_value_disabled.png | Bin .../config_value_disabled_highlighted.png | Bin .../sprites/gamerule/config_value_enabled.png | Bin .../config_value_enabled_highlighted.png | Bin .../lang/en_us.json | 6 --- ...> config_extensions_gamerules.mixins.json} | 2 +- .../testmod/platform/package-info.java | 14 ------ ...houseConfigExtensionsGameRulesTestmod.java | 18 +++---- .../greenhouse/GreenhouseConfigImpl.java | 14 +++--- .../greenhouse/GreenhouseGameRuleConfig.java | 2 +- .../testmod/kaleido/KaleidoConfigImpl.java | 10 ++-- .../kaleido/KaleidoGameRuleConfig.java | 6 +-- ...tensionsGameRulesTestmodHelperLoaders.java | 8 +-- ...ensionsGameRulesTestmodPlatformHelper.java | 2 +- .../gamerules/testmod}/platform/Platform.java | 2 +- .../testmod}/platform/package-info.java | 2 +- .../testmod/registry/DeferredRegistry.java | 4 +- .../testmod/registry/DeferredValue.java | 2 +- .../lang/en_us.json | 18 +++---- 105 files changed, 544 insertions(+), 490 deletions(-) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/ModPlatform.kt (96%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/Properties.kt (50%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/api.gradle.kts (74%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/java.gradle.kts (81%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/merge.gradle.kts (93%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/publish.gradle.kts (78%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/repositories.gradle.kts (60%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/base/root.gradle.kts (77%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/platform/fabric.gradle.kts (77%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/platform/loader.gradle.kts (68%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/platform/neoforge.gradle.kts (89%) rename build_logic/src/main/kotlin/{lgbt/greenhouse => org/vulpixel}/config_extensions/gradle/platform/xplat.gradle.kts (57%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java (67%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java (72%) rename gamerules/{xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command => fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client}/package-info.java (85%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java (79%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java (72%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java (75%) rename gamerules/{xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck => fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl}/package-info.java (86%) rename gamerules/fabric/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java (77%) create mode 100644 gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/package-info.java rename gamerules/fabric/src/main/resources/{greenhouse_config_extensions_gamerules.classtweaker => config_extensions_gamerules.classtweaker} (100%) create mode 100644 gamerules/fabric/src/main/resources/config_extensions_gamerules.fabric.mixins.json delete mode 100644 gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.fabric.mixins.json rename gamerules/fabric/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java (77%) rename gamerules/fabric/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java (74%) delete mode 100644 gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/package-info.java rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java (72%) rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java (77%) rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java (80%) rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java (77%) rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java (83%) rename gamerules/{xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client => neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl}/package-info.java (85%) rename gamerules/neoforge/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java (77%) rename gamerules/{fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client => neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform}/package-info.java (84%) rename gamerules/neoforge/src/main/resources/{greenhouse_config_extensions_gamerules.cfg => config_extensions_gamerules.cfg} (100%) create mode 100644 gamerules/neoforge/src/main/resources/config_extensions_gamerules.neoforge.mixins.json create mode 100644 gamerules/neoforge/src/main/resources/config_extensions_gamerules_extensions.json delete mode 100644 gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.neoforge.mixins.json delete mode 100644 gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules_extensions.json rename gamerules/neoforge/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java (86%) rename gamerules/neoforge/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java (73%) delete mode 100644 gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/package-info.java delete mode 100644 gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java delete mode 100644 gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/package-info.java delete mode 100644 gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/package-info.java rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java (81%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/api/v1/gamerule/package-info.java (83%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java (70%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/NullableCodec.java (87%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java (87%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java (57%) create mode 100644 gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/package-info.java rename gamerules/{fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl => xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client}/package-info.java (86%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java (84%) rename gamerules/{fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform => xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule}/package-info.java (83%) rename gamerules/{neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl => xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen}/package-info.java (85%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java (94%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java (96%) create mode 100644 gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/package-info.java rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java (55%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java (71%) create mode 100644 gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/package-info.java rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java (76%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java (63%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java (75%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java (70%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java (81%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java (76%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java (71%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java (68%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java (77%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java (90%) create mode 100644 gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/package-info.java rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java (90%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/package-info.java (87%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java (83%) rename gamerules/xplat/src/main/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java (95%) rename gamerules/xplat/src/{testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod => main/java/org/vulpixel/config_extensions/gamerules/impl}/platform/Platform.java (82%) create mode 100644 gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/package-info.java create mode 100644 gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/lang/en_us.json rename gamerules/xplat/src/main/resources/assets/{greenhouse_config_extensions_gamerules => config_extensions_gamerules}/textures/gui/sprites/gamerule/config_value_disabled.png (100%) rename gamerules/xplat/src/main/resources/assets/{greenhouse_config_extensions_gamerules => config_extensions_gamerules}/textures/gui/sprites/gamerule/config_value_disabled_highlighted.png (100%) rename gamerules/xplat/src/main/resources/assets/{greenhouse_config_extensions_gamerules => config_extensions_gamerules}/textures/gui/sprites/gamerule/config_value_enabled.png (100%) rename gamerules/xplat/src/main/resources/assets/{greenhouse_config_extensions_gamerules => config_extensions_gamerules}/textures/gui/sprites/gamerule/config_value_enabled_highlighted.png (100%) delete mode 100644 gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/lang/en_us.json rename gamerules/xplat/src/main/resources/{greenhouse_config_extensions_gamerules.mixins.json => config_extensions_gamerules.mixins.json} (87%) delete mode 100644 gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/package-info.java rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java (75%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java (76%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java (84%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java (73%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java (73%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java (83%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java (85%) rename gamerules/xplat/src/{main/java/lgbt/greenhouse/config_extensions/gamerules/impl => testmod/java/org/vulpixel/config_extensions/gamerules/testmod}/platform/Platform.java (83%) rename gamerules/xplat/src/{main/java/lgbt/greenhouse/config_extensions/gamerules/impl => testmod/java/org/vulpixel/config_extensions/gamerules/testmod}/platform/package-info.java (86%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/registry/DeferredRegistry.java (90%) rename gamerules/xplat/src/testmod/java/{lgbt/greenhouse => org/vulpixel}/config_extensions/gamerules/testmod/registry/DeferredValue.java (94%) diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/ModPlatform.kt b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/ModPlatform.kt similarity index 96% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/ModPlatform.kt rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/ModPlatform.kt index 8996d9c..4fa7234 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/ModPlatform.kt +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/ModPlatform.kt @@ -1,4 +1,4 @@ -package lgbt.greenhouse.config_extensions.gradle +package org.vulpixel.config_extensions.gradle import org.gradle.kotlin.dsl.support.uppercaseFirstChar diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/Properties.kt b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/Properties.kt similarity index 50% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/Properties.kt rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/Properties.kt index de35ea4..2cfe2fc 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/Properties.kt +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/Properties.kt @@ -1,16 +1,16 @@ -package lgbt.greenhouse.config_extensions.gradle +package org.vulpixel.config_extensions.gradle object Properties { - val MOD_VERSION = mapModVersion("0.1.1") + val MOD_VERSION = mapModVersion("0.2.0") val FRIENDLY_MINECRAFT_VERSION = mapMinecraftVersion("26.2.x") const val JAVA_VERSION = 25 - const val GROUP = "lgbt.greenhouse.config_extensions" - const val MOD_NAME = "Greenhouse Config Extensions" - const val MOD_ID = "greenhouse_config_extensions" - const val MOD_AUTHOR = "Greenhouse Modding" - val MOD_CONTRIBUTORS = listOf("ChrysanthCow") - const val DESCRIPTION = "Config Library agnostic extensions." + const val GROUP = "org.vulpixel.config_extensions" + const val MOD_NAME = "Config Extensions" + const val MOD_ID = "config_extensions" + const val MOD_AUTHOR = "Vulpixel" + val MOD_CONTRIBUTORS = listOf("MerchantCalico ") + const val DESCRIPTION = "Config-library agnostic specific extensions for Minecraft." const val LICENSE = "MPL-2.0" val SUPPORTED_MINECRAFT_VERSIONS = listOf("26.2") @@ -23,20 +23,20 @@ object Properties { const val NEOFORGE_VERSION_RANGE = "[26.2.0.15-beta,26.3)" const val NEOFORGE_MINECRAFT_VERSION_RANGE = "[26.2,26.3)" - const val FORGEJO_URL = "https://git.greenhouse.lgbt" - const val FORGEJO_REPO = "Modding/greenhouse-config-extensions" - const val FORGEJO_COMMITISH = "26.2.x" + const val FORGEJO_URL = "https://tangled.org/vulpixel.org/" + const val GIT_REPO = "config_extensions" + const val GIT_COMMITISH = "26.2.x" - val MAVEN_URL = mapMavenUrl("https://maven.greenhouse.lgbt/") + val MAVEN_URL = mapMavenUrl("https://maven.sylv.gay/") val MODULES = mapOf( "gamerules" to ModuleProperties( "gamerules", - "Greenhouse Config Extensions - Game Rules", + "Config Extensions - Game Rules", "Config Library agnostic extensions for gamerules.", - mapModVersion("0.1.1"), - "greenhouse_config_extensions_gamerules", - "greenhouse-config-extensions-gamerules" + mapModVersion("0.2.0"), + "config_extensions_gamerules", + "config-extensions-gamerules" ) ) @@ -52,16 +52,22 @@ object Properties { fun mapModVersion(modVersion: String): String { if (System.getenv("RELEASE_TYPE") != "releases") { - return "${modVersion}-dev" + return "${modVersion}+dev" } return modVersion } fun mapMinecraftVersion(minecraftVersion: String): String { - if (System.getenv("RELEASE_TYPE") != "releases" && System.getenv("FORGEJO_SHA") != null) { - val sha = "${System.getenv("FORGEJO_SHA")}" - return "${minecraftVersion}-${sha}" + if (System.getenv("RELEASE_TYPE") != "releases") { + if (System.getenv("TANGLED_COMMIT_SHA") != null) { + val sha = "${System.getenv("TANGLED_COMMIT_SHA")}" + return "${minecraftVersion}+${sha}" + } else if (System.getenv("FORGEJO_SHA") != null) { + val sha = "${System.getenv("FORGEJO_SHA")}" + return "${minecraftVersion}+${sha}" + } } + return minecraftVersion } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/api.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/api.gradle.kts similarity index 74% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/api.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/api.gradle.kts index 9a97221..d890b04 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/api.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/api.gradle.kts @@ -1,19 +1,30 @@ -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base -import lgbt.greenhouse.config_extensions.gradle.ModPlatform -import lgbt.greenhouse.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties +import org.gradle.api.attributes.Attribute +import org.gradle.api.attributes.Bundling +import org.gradle.api.attributes.Category +import org.gradle.api.attributes.LibraryElements +import org.gradle.api.attributes.Usage +import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.jvm.component.internal.DefaultJvmSoftwareComponent import org.gradle.jvm.tasks.Jar +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getByName +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.named +import org.gradle.kotlin.dsl.register plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.java") + id("org.vulpixel.config_extensions.gradle.base.java") } val props = project.ext["props"] as Properties.ModuleProperties val javaComponent = components.getByName("java") val platform = ModPlatform.getProjectPlatform(project.name) -val greenhouseModdingApiAttribute = Attribute.of("lgbt.greenhouse.modding.api", String::class.java) +val greenhouseModdingApiAttribute = Attribute.of("org.vulpixel.modding.api", String::class.java) configurations { register("apiApiElements") { diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/java.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/java.gradle.kts similarity index 81% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/java.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/java.gradle.kts index 466177d..8e177dd 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/java.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/java.gradle.kts @@ -1,14 +1,23 @@ @file:Suppress("AvoidDuplicateDependencies") // IntelliJ, output is not null. -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base -import lgbt.greenhouse.config_extensions.gradle.ModPlatform -import lgbt.greenhouse.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.attributes.Attribute +import org.gradle.api.tasks.bundling.Jar +import org.gradle.jvm.toolchain.JavaLanguageVersion +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.`java-library` +import org.gradle.kotlin.dsl.named +import org.gradle.kotlin.dsl.withType +import org.gradle.language.jvm.tasks.ProcessResources plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.root") - `java-library` + id("org.vulpixel.config_extensions.gradle.base.root") + `java-library` } // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 @@ -16,7 +25,7 @@ val libs = project.ext["libs"] as LibrariesForLibs val props = project.ext["props"] as Properties.ModuleProperties val platformName = ModPlatform.getProjectPlatformName(project.name) -val platformAttribute = Attribute.of("lgbt.greenhouse.modding.platform", String::class.java) +val platformAttribute = Attribute.of("org.vulpixel.modding.platform", String::class.java) sourceSets { register("testmod") { @@ -81,6 +90,10 @@ tasks { "fabric_minecraft_version_range" to Properties.FABRIC_MINECRAFT_VERSION_RANGE, "fabric_loader_version_range" to Properties.FABRIC_LOADER_VERSION_RANGE, "fabric_api_version_range" to Properties.FABRIC_API_VERSION_RANGE, + "neoforge_version" to libs.versions.neoforge.get(), + "neoforge_minecraft_version_range" to Properties.NEOFORGE_MINECRAFT_VERSION_RANGE, + "neoforge_loader_version_range" to Properties.NEOFORGE_LOADER_VERSION_RANGE, + "neoforge_version_range" to Properties.NEOFORGE_VERSION_RANGE, "mod_name" to props.displayName, "mod_author" to Properties.MOD_AUTHOR, "neoforge_mod_contributors" to Properties.MOD_CONTRIBUTORS.joinToString(), @@ -88,12 +101,8 @@ tasks { "mod_id" to props.modId, "mod_license" to Properties.LICENSE, "mod_description" to props.description, - "neoforge_version" to libs.versions.neoforge.get(), - "neoforge_minecraft_version_range" to Properties.NEOFORGE_MINECRAFT_VERSION_RANGE, - "neoforge_loader_version_range" to Properties.NEOFORGE_LOADER_VERSION_RANGE, - "neoforge_version_range" to Properties.NEOFORGE_VERSION_RANGE, "java_version" to Properties.JAVA_VERSION, - "sources" to "${Properties.FORGEJO_URL}/${Properties.FORGEJO_REPO}", + "sources" to "${Properties.FORGEJO_URL}/${Properties.GIT_REPO}", "root_mod_id" to Properties.MOD_ID, "root_mod_name" to Properties.MOD_NAME, "root_mod_description" to Properties.DESCRIPTION diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/merge.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/merge.gradle.kts similarity index 93% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/merge.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/merge.gradle.kts index 8457c1b..2051da1 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/merge.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/merge.gradle.kts @@ -1,16 +1,34 @@ @file:Suppress("AvoidDuplicateDependencies", "DuplicatedCode") -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base -import lgbt.greenhouse.config_extensions.gradle.ModPlatform -import lgbt.greenhouse.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.artifacts.ConfigurationContainer +import org.gradle.api.artifacts.dsl.ArtifactHandler +import org.gradle.api.attributes.Attribute +import org.gradle.api.attributes.Bundling +import org.gradle.api.attributes.Category +import org.gradle.api.attributes.DocsType +import org.gradle.api.attributes.LibraryElements +import org.gradle.api.attributes.Usage +import org.gradle.api.attributes.java.TargetJvmEnvironment +import org.gradle.api.attributes.java.TargetJvmVersion +import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.internal.tasks.JvmConstants import org.gradle.api.publish.internal.component.DefaultAdhocSoftwareComponent +import org.gradle.api.tasks.bundling.Jar import org.gradle.jvm.component.internal.DefaultJvmSoftwareComponent +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.named +import org.gradle.kotlin.dsl.project +import org.gradle.kotlin.dsl.register +import org.gradle.kotlin.dsl.the plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.java") + id("org.vulpixel.config_extensions.gradle.base.java") } // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192 @@ -23,8 +41,8 @@ val xplatProject = ":${ModPlatform.XPLAT.mapProjectName(project.name)}" val fabricProject = ":${ModPlatform.FABRIC.mapProjectName(project.name)}" val neoforgeProject = ":${ModPlatform.NEOFORGE.mapProjectName(project.name)}" -val greenhouseModdingPlatformAttribute = Attribute.of("lgbt.greenhouse.modding.platform", String::class.java) -val greenhouseModdingApiAttribute = Attribute.of("lgbt.greenhouse.modding.api", String::class.java) +val greenhouseModdingPlatformAttribute = Attribute.of("org.vulpixel.modding.platform", String::class.java) +val greenhouseModdingApiAttribute = Attribute.of("org.vulpixel.modding.api", String::class.java) val mcGradleConventionsAttribute = Attribute.of("io.github.mcgradleconventions.loader", String::class.java) val hasApi = configurations.findByName("apiApiElements") != null @@ -498,12 +516,12 @@ fun ConfigurationContainer.createPlatformElements(modPlatform: ModPlatform) { } } -fun jarFile(projectName: String, classifier: String): File { +fun jarFile(projectName: String, classifier: String): java.io.File { val finalClassifier: String = if (!classifier.isBlank()) "-${classifier}" else classifier return rootProject.file("${props.name}/${projectName}/build/libs/${props.archivesBaseName}-${props.version}+${Properties.FRIENDLY_MINECRAFT_VERSION}${finalClassifier}-${projectName}.jar") } -fun neoforgeInterfaceInjectionsFile(): File { +fun neoforgeInterfaceInjectionsFile(): java.io.File { return rootProject.file("${props.name}/neoforge/interfaces.json") } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/publish.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/publish.gradle.kts similarity index 78% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/publish.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/publish.gradle.kts index 2ea0483..5dbd187 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/publish.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/publish.gradle.kts @@ -1,10 +1,15 @@ -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base -import lgbt.greenhouse.config_extensions.gradle.Properties -import lgbt.greenhouse.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.ModPlatform +import org.gradle.api.publish.maven.MavenPublication +import org.gradle.authentication.http.BasicAuthentication +import org.gradle.kotlin.dsl.create +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.`maven-publish` plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.java") + id("org.vulpixel.config_extensions.gradle.base.java") `maven-publish` } diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/repositories.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/repositories.gradle.kts similarity index 60% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/repositories.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/repositories.gradle.kts index 31bea79..74576d5 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/repositories.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/repositories.gradle.kts @@ -1,7 +1,10 @@ -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base + +import org.gradle.kotlin.dsl.maven +import org.gradle.kotlin.dsl.repositories plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.root") + id("org.vulpixel.config_extensions.gradle.base.root") } repositories { diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/root.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/root.gradle.kts similarity index 77% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/root.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/root.gradle.kts index ae5d85f..a8622e9 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/base/root.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/base/root.gradle.kts @@ -1,8 +1,8 @@ -package lgbt.greenhouse.config_extensions.gradle.base +package org.vulpixel.config_extensions.gradle.base import dev.yumi.gradle.licenser.YumiLicenserGradleExtension -import lgbt.greenhouse.config_extensions.gradle.Properties -import lgbt.greenhouse.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.ModPlatform import org.gradle.accessors.dm.LibrariesForLibs plugins { @@ -18,7 +18,7 @@ val modPlatform = ModPlatform.getProjectPlatform(project.name) val moduleName = modPlatform.mapModuleName(project.name) val props = Properties.MODULES[moduleName]!! -val platformAttribute = Attribute.of("lgbt.greenhouse.modding.platform", String::class.java) +val platformAttribute = Attribute.of("org.vulpixel.modding.platform", String::class.java) project.ext["props"] = props project.ext["platform_attribute"] = platformAttribute diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/fabric.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/fabric.gradle.kts similarity index 77% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/fabric.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/fabric.gradle.kts index 32b699e..917fae7 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/fabric.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/fabric.gradle.kts @@ -1,12 +1,22 @@ -package lgbt.greenhouse.config_extensions.gradle.platform +package org.vulpixel.config_extensions.gradle.platform -import lgbt.greenhouse.config_extensions.gradle.Properties +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.ext +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.implementation +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.sourceSets +import org.vulpixel.config_extensions.gradle.Properties import net.fabricmc.loom.api.LoomGradleExtensionAPI import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.Project +import org.gradle.api.attributes.Attribute +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getByName +import org.gradle.kotlin.dsl.maven +import org.gradle.kotlin.dsl.repositories import org.gradle.kotlin.dsl.support.uppercaseFirstChar plugins { - id("lgbt.greenhouse.config_extensions.gradle.platform.loader") + id("org.vulpixel.config_extensions.gradle.platform.loader") } val libs = project.ext["libs"] as LibrariesForLibs @@ -38,7 +48,7 @@ dependencies { "localRuntime"(libs.mod.menu) - val greenhouseModdingApiAttribute = Attribute.of("lgbt.greenhouse.modding.api", String::class.java) + val greenhouseModdingApiAttribute = Attribute.of("org.vulpixel.modding.api", String::class.java) "testmodCompileOnly"(libs.greenhouse.config) { attributes { attribute(greenhouseModdingApiAttribute, "") diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/loader.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/loader.gradle.kts similarity index 68% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/loader.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/loader.gradle.kts index 713fd63..092f68f 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/loader.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/loader.gradle.kts @@ -1,16 +1,26 @@ -package lgbt.greenhouse.config_extensions.gradle.platform +package org.vulpixel.config_extensions.gradle.platform -import lgbt.greenhouse.config_extensions.gradle.ModPlatform -import lgbt.greenhouse.config_extensions.gradle.Properties +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.api +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.ext +import gradle.kotlin.dsl.accessors._53d1812366d96f3ba14deef8baabc09a.sourceSets +import org.vulpixel.config_extensions.gradle.ModPlatform +import org.vulpixel.config_extensions.gradle.Properties +import org.gradle.api.attributes.Attribute +import org.gradle.api.tasks.bundling.Jar +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getByName +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.named plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.java") - id("lgbt.greenhouse.config_extensions.gradle.base.repositories") + id("org.vulpixel.config_extensions.gradle.base.java") + id("org.vulpixel.config_extensions.gradle.base.repositories") } val props = project.ext["props"] as Properties.ModuleProperties -val platformAttribute = Attribute.of("lgbt.greenhouse.modding.platform", String::class.java) +val platformAttribute = Attribute.of("org.vulpixel.modding.platform", String::class.java) val xplatProjectName = ":${ModPlatform.XPLAT.mapProjectName(name)}" val xplatProject = project(xplatProjectName) diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/neoforge.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/neoforge.gradle.kts similarity index 89% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/neoforge.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/neoforge.gradle.kts index bc17c10..5c155b0 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/neoforge.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/neoforge.gradle.kts @@ -1,11 +1,14 @@ -package lgbt.greenhouse.config_extensions.gradle.platform +package org.vulpixel.config_extensions.gradle.platform -import lgbt.greenhouse.config_extensions.gradle.Properties +import org.vulpixel.config_extensions.gradle.Properties import net.neoforged.moddevgradle.dsl.NeoForgeExtension import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.invoke +import kotlin.text.get plugins { - id("lgbt.greenhouse.config_extensions.gradle.platform.loader") + id("org.vulpixel.config_extensions.gradle.platform.loader") } val libs = project.ext["libs"] as LibrariesForLibs @@ -38,7 +41,7 @@ configurations { } dependencies { - val greenhouseModdingApiAttribute = Attribute.of("lgbt.greenhouse.modding.api", String::class.java) + val greenhouseModdingApiAttribute = Attribute.of("org.vulpixel.modding.api", String::class.java) "testmodCompileOnly"(libs.greenhouse.config) { attributes { attribute(greenhouseModdingApiAttribute, "") diff --git a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/xplat.gradle.kts b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/xplat.gradle.kts similarity index 57% rename from build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/xplat.gradle.kts rename to build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/xplat.gradle.kts index cf61591..a52e242 100644 --- a/build_logic/src/main/kotlin/lgbt/greenhouse/config_extensions/gradle/platform/xplat.gradle.kts +++ b/build_logic/src/main/kotlin/org/vulpixel/config_extensions/gradle/platform/xplat.gradle.kts @@ -1,21 +1,32 @@ -package lgbt.greenhouse.config_extensions.gradle.platform +package org.vulpixel.config_extensions.gradle.platform -import lgbt.greenhouse.config_extensions.gradle.Properties +import gradle.kotlin.dsl.accessors._1d322aa781dbcb4fdd21ee7134148a5a.annotationProcessor +import gradle.kotlin.dsl.accessors._1d322aa781dbcb4fdd21ee7134148a5a.compileOnly +import gradle.kotlin.dsl.accessors._1d322aa781dbcb4fdd21ee7134148a5a.ext +import org.vulpixel.config_extensions.gradle.Properties import net.fabricmc.loom.api.LoomGradleExtensionAPI import org.gradle.accessors.dm.LibrariesForLibs +import org.gradle.api.attributes.Attribute +import org.gradle.api.tasks.bundling.Jar +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getByName +import org.gradle.kotlin.dsl.maven +import org.gradle.kotlin.dsl.named +import org.gradle.kotlin.dsl.repositories plugins { - id("lgbt.greenhouse.config_extensions.gradle.base.java") - id("lgbt.greenhouse.config_extensions.gradle.base.api") - id("lgbt.greenhouse.config_extensions.gradle.base.merge") - id("lgbt.greenhouse.config_extensions.gradle.base.repositories") - id("lgbt.greenhouse.config_extensions.gradle.base.publish") + id("org.vulpixel.config_extensions.gradle.base.java") + id("org.vulpixel.config_extensions.gradle.base.api") + id("org.vulpixel.config_extensions.gradle.base.merge") + id("org.vulpixel.config_extensions.gradle.base.repositories") + id("org.vulpixel.config_extensions.gradle.base.publish") } val libs = project.ext["libs"] as LibrariesForLibs val props = project.ext["props"] as Properties.ModuleProperties -val platformAttribute = Attribute.of("lgbt.greenhouse.modding.platform", String::class.java) +val platformAttribute = Attribute.of("org.vulpixel.modding.platform", String::class.java) val hasApi = configurations.findByName("apiApiElements") != null @@ -56,7 +67,7 @@ dependencies { compileOnly(libs.mixin.extras) annotationProcessor(libs.mixin.extras) - val greenhouseModdingApiAttribute = Attribute.of("lgbt.greenhouse.modding.api", String::class.java) + val greenhouseModdingApiAttribute = Attribute.of("org.vulpixel.modding.api", String::class.java) "testmodCompileOnly"(libs.greenhouse.config) { attributes { attribute(greenhouseModdingApiAttribute, "") diff --git a/gamerules/fabric/build.gradle.kts b/gamerules/fabric/build.gradle.kts index b95ff57..5568732 100644 --- a/gamerules/fabric/build.gradle.kts +++ b/gamerules/fabric/build.gradle.kts @@ -1,8 +1,7 @@ -import lgbt.greenhouse.config_extensions.gradle.Properties -import org.gradle.kotlin.dsl.support.uppercaseFirstChar +import org.vulpixel.config_extensions.gradle.Properties plugins { - id("lgbt.greenhouse.config_extensions.gradle.platform.fabric") + id("org.vulpixel.config_extensions.gradle.platform.fabric") } val props = project.ext["props"] as Properties.ModuleProperties diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java similarity index 67% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java index 9978ab1..331eec9 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/GreenhouseConfigExtensionsGameRulesFabric.java @@ -6,14 +6,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl; +package org.vulpixel.config_extensions.gamerules.fabric.impl; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentType; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentTypeInfo; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentType; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentTypeInfo; +import org.vulpixel.config_extensions.gamerules.impl.network.GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java similarity index 72% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java index a8f2dbe..1233811 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/GreenhouseConfigExtensionsGameRulesClientFabric.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.client; +package org.vulpixel.config_extensions.gamerules.fabric.impl.client; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.network.GreenhouseConfigClientboundPacketHandlers; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.client.network.GreenhouseConfigClientboundPacketHandlers; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/package-info.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/package-info.java similarity index 85% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/package-info.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/package-info.java index 9e06f85..15d24a3 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/package-info.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/client/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.command; +package org.vulpixel.config_extensions.gamerules.fabric.impl.client; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java similarity index 79% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java index 4b42f7c..c7b9d3d 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Accessor_AbstractGameRulesScreenRuleList.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.mixin; +package org.vulpixel.config_extensions.gamerules.fabric.impl.mixin; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import org.spongepowered.asm.mixin.Mixin; @@ -15,5 +15,5 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(AbstractGameRulesScreen.RuleList.class) public interface Accessor_AbstractGameRulesScreenRuleList { @Accessor("this$0") - AbstractGameRulesScreen greenhouse_config_extensions_gamerules$getThis(); + AbstractGameRulesScreen config_extensions_gamerules$getThis(); } diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java similarity index 72% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java index ff29f16..c0b29ff 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_AbstractGameRulesScreenRuleList1.java @@ -6,13 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.mixin; +package org.vulpixel.config_extensions.gamerules.fabric.impl.mixin; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.screen.gamerule.ViaConfigGameRuleEntry; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRuleTypeVisitor; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; +import org.vulpixel.config_extensions.gamerules.impl.client.screen.gamerule.ViaConfigGameRuleEntry; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRuleTypeVisitor; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.client.gui.screens.worldselection.WorldCreationGameRulesScreen; import net.minecraft.network.chat.Component; @@ -41,35 +41,35 @@ public abstract class Mixin_AbstractGameRulesScreenRuleList1 implements Duck_Via abstract void addEntry(final GameRule gameRule, final AbstractGameRulesScreen.EntryFactory factory); @Unique - private AbstractGameRulesScreen.RuleEntry greenhouse_config_extensions_gamerules$innerEntry; + private AbstractGameRulesScreen.RuleEntry config_extensions_gamerules$innerEntry; @Inject(method = "addEntry(Lnet/minecraft/world/level/gamerules/GameRule;Lnet/minecraft/client/gui/screens/worldselection/AbstractGameRulesScreen$EntryFactory;)V", at = @At(value = "INVOKE", target = "java/util/Map.computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"), cancellable = true) - private void greenhouse_config_extensions_gamerules$collectInnerEntry(final GameRule gameRule, + private void config_extensions_gamerules$collectInnerEntry(final GameRule gameRule, final AbstractGameRulesScreen.EntryFactory factory, CallbackInfo ci, @Local(ordinal = 0) Component readableName, @Local List tooltip, @Local(ordinal = 1) String narration) { if (GreenhouseConfigExtensionsGameRulesClient.OBTAIN_INNER_VALUE.isBound()) { - greenhouse_config_extensions_gamerules$innerEntry = factory.create(readableName, tooltip, narration, gameRule); + config_extensions_gamerules$innerEntry = factory.create(readableName, tooltip, narration, gameRule); ci.cancel(); } } @Override - public void greenhouse_config_extensions_gamerules$visitConfigBacked(final @NonNull ViaConfigGameRule gameRule) { + public void config_extensions_gamerules$visitConfigBacked(final @NonNull ViaConfigGameRule gameRule) { addEntry(gameRule, (component, tooltip, _, _) -> { ScopedValue.where(GreenhouseConfigExtensionsGameRulesClient.OBTAIN_INNER_VALUE, Unit.INSTANCE) .run(() -> gameRule.innerVisitorCaller().call((GameRuleTypeVisitor) this, gameRule)); ViaConfigGameRuleEntry entry = new ViaConfigGameRuleEntry<>( - ((Accessor_AbstractGameRulesScreenRuleList) this$1).greenhouse_config_extensions_gamerules$getThis(), + ((Accessor_AbstractGameRulesScreenRuleList) this$1).config_extensions_gamerules$getThis(), gameRule, - greenhouse_config_extensions_gamerules$innerEntry, + config_extensions_gamerules$innerEntry, tooltip, component ); - greenhouse_config_extensions_gamerules$innerEntry = null; + config_extensions_gamerules$innerEntry = null; return entry; }); } diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java similarity index 75% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java index b63d871..35bd87e 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/mixin/Mixin_GameRuleType.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.mixin; +package org.vulpixel.config_extensions.gamerules.fabric.impl.mixin; import net.minecraft.world.level.gamerules.GameRuleType; import org.spongepowered.asm.mixin.Mixin; @@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.Shadow; @Mixin(GameRuleType.class) public enum Mixin_GameRuleType { - GREENHOUSE_CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG("greenhouse_config_extensions_gamerules:via_config"); + CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG("config_extensions_gamerules:via_config"); @Shadow Mixin_GameRuleType(final String name) { diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/package-info.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/package-info.java similarity index 86% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/package-info.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/package-info.java index 97eac2a..9f45234 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/package-info.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.duck; +package org.vulpixel.config_extensions.gamerules.fabric.impl; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java similarity index 77% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java rename to gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java index 6e62cde..bc41137 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperFabric.java @@ -6,12 +6,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.platform; +package org.vulpixel.config_extensions.gamerules.fabric.impl.platform; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.Platform; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; +import org.vulpixel.config_extensions.gamerules.impl.platform.Platform; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; diff --git a/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/package-info.java b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/package-info.java new file mode 100644 index 0000000..640fdf6 --- /dev/null +++ b/gamerules/fabric/src/main/java/org/vulpixel/config_extensions/gamerules/fabric/impl/platform/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.fabric.impl.platform; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.classtweaker b/gamerules/fabric/src/main/resources/config_extensions_gamerules.classtweaker similarity index 100% rename from gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.classtweaker rename to gamerules/fabric/src/main/resources/config_extensions_gamerules.classtweaker diff --git a/gamerules/fabric/src/main/resources/config_extensions_gamerules.fabric.mixins.json b/gamerules/fabric/src/main/resources/config_extensions_gamerules.fabric.mixins.json new file mode 100644 index 0000000..0b6adcb --- /dev/null +++ b/gamerules/fabric/src/main/resources/config_extensions_gamerules.fabric.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "org.vulpixel.config_extensions.gamerules.fabric.impl.mixin", + "compatibilityLevel": "JAVA_25", + "mixins": [ + "Accessor_AbstractGameRulesScreenRuleList", + "Mixin_AbstractGameRulesScreenRuleList1", + "Mixin_GameRuleType" + ], + "injectors": { + "defaultRequire": 1 + }, + "mixinextras": { + "minVersion": "0.5.0" + } +} diff --git a/gamerules/fabric/src/main/resources/fabric.mod.json b/gamerules/fabric/src/main/resources/fabric.mod.json index 58357fd..c2a6d80 100644 --- a/gamerules/fabric/src/main/resources/fabric.mod.json +++ b/gamerules/fabric/src/main/resources/fabric.mod.json @@ -19,10 +19,10 @@ "environment": "*", "entrypoints": { "main": [ - "lgbt.greenhouse.config_extensions.gamerules.fabric.impl.GreenhouseConfigExtensionsGameRulesFabric" + "org.vulpixel.config_extensions.gamerules.fabric.impl.GreenhouseConfigExtensionsGameRulesFabric" ], "client": [ - "lgbt.greenhouse.config_extensions.gamerules.fabric.impl.client.GreenhouseConfigExtensionsGameRulesClientFabric" + "org.vulpixel.config_extensions.gamerules.fabric.impl.client.GreenhouseConfigExtensionsGameRulesClientFabric" ] }, "mixins": [ diff --git a/gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.fabric.mixins.json b/gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.fabric.mixins.json deleted file mode 100644 index 4c9c5d6..0000000 --- a/gamerules/fabric/src/main/resources/greenhouse_config_extensions_gamerules.fabric.mixins.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "lgbt.greenhouse.config_extensions.gamerules.fabric.impl.mixin", - "compatibilityLevel": "JAVA_25", - "mixins": [ - "Accessor_AbstractGameRulesScreenRuleList", - "Mixin_AbstractGameRulesScreenRuleList1", - "Mixin_GameRuleType" - ], - "injectors": { - "defaultRequire": 1 - }, - "mixinextras": { - "minVersion": "0.5.0" - } -} diff --git a/gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java b/gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java similarity index 77% rename from gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java rename to gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java index 02cba59..07aa457 100644 --- a/gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java +++ b/gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/GreenhouseConfigExtensionsGameRulesTestmodFabric.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.testmod; +package org.vulpixel.config_extensions.gamerules.fabric.testmod; -import lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; +import org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; import net.fabricmc.api.ModInitializer; public class GreenhouseConfigExtensionsGameRulesTestmodFabric implements ModInitializer { diff --git a/gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java b/gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java similarity index 74% rename from gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java rename to gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java index ede7c63..894787b 100644 --- a/gamerules/fabric/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java +++ b/gamerules/fabric/src/testmod/java/org/vulpixel/config_extensions/gamerules/fabric/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.fabric.testmod.platform; +package org.vulpixel.config_extensions.gamerules.fabric.testmod.platform; -import lgbt.greenhouse.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; +import org.vulpixel.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; import net.fabricmc.loader.api.FabricLoader; import java.nio.file.Path; diff --git a/gamerules/fabric/src/testmod/resources/fabric.mod.json b/gamerules/fabric/src/testmod/resources/fabric.mod.json index 5f769dc..ba4c117 100644 --- a/gamerules/fabric/src/testmod/resources/fabric.mod.json +++ b/gamerules/fabric/src/testmod/resources/fabric.mod.json @@ -19,7 +19,7 @@ "environment": "*", "entrypoints": { "main": [ - "lgbt.greenhouse.config_extensions.gamerules.fabric.testmod.GreenhouseConfigExtensionsGameRulesTestmodFabric" + "org.vulpixel.config_extensions.gamerules.fabric.testmod.GreenhouseConfigExtensionsGameRulesTestmodFabric" ] }, "depends": { diff --git a/gamerules/neoforge/build.gradle.kts b/gamerules/neoforge/build.gradle.kts index 9a9c3e4..6bab3bb 100644 --- a/gamerules/neoforge/build.gradle.kts +++ b/gamerules/neoforge/build.gradle.kts @@ -1,3 +1,3 @@ plugins { - id("lgbt.greenhouse.config_extensions.gradle.platform.neoforge") + id("org.vulpixel.config_extensions.gradle.platform.neoforge") } diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/package-info.java b/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/package-info.java deleted file mode 100644 index dea327b..0000000 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.platform; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java similarity index 72% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java index 9277025..059a84c 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/GreenhouseConfigExtensionsGameRulesNeoForge.java @@ -6,15 +6,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl; +package org.vulpixel.config_extensions.gamerules.neoforge.impl; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentType; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentTypeInfo; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.client.GreenhouseConfigExtensionsGameRulesClientNeoForge; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentType; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentTypeInfo; +import org.vulpixel.config_extensions.gamerules.impl.network.GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; import net.minecraft.commands.synchronization.ArgumentTypeInfos; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; @@ -26,7 +25,6 @@ import net.neoforged.fml.common.Mod; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; import net.neoforged.neoforge.registries.RegisterEvent; -import org.jspecify.annotations.Nullable; @Mod(GreenhouseConfigExtensionsGameRules.MOD_ID) @EventBusSubscriber(modid = GreenhouseConfigExtensionsGameRules.MOD_ID) diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java similarity index 77% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java index fe40e19..1c30715 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/client/GreenhouseConfigExtensionsGameRulesClientNeoForge.java @@ -6,16 +6,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.client; - -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.network.GreenhouseConfigClientboundPacketHandlers; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.screen.gamerule.ViaConfigGameRuleEntry; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.GreenhouseConfigExtensionsGameRulesNeoForge; -import lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.mixin.client.Accessor_GameRuleEntryFactoryManager; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.client; + +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; +import org.vulpixel.config_extensions.gamerules.impl.client.network.GreenhouseConfigClientboundPacketHandlers; +import org.vulpixel.config_extensions.gamerules.impl.client.screen.gamerule.ViaConfigGameRuleEntry; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.neoforge.impl.GreenhouseConfigExtensionsGameRulesNeoForge; +import org.vulpixel.config_extensions.gamerules.neoforge.impl.mixin.client.Accessor_GameRuleEntryFactoryManager; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.util.Unit; import net.minecraft.world.level.gamerules.GameRuleType; @@ -30,8 +30,6 @@ import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlers import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; -import java.util.Objects; - @Mod(GreenhouseConfigExtensionsGameRules.MOD_ID) @EventBusSubscriber(modid = GreenhouseConfigExtensionsGameRules.MOD_ID) public class GreenhouseConfigExtensionsGameRulesClientNeoForge { @@ -65,7 +63,7 @@ public class GreenhouseConfigExtensionsGameRulesClientNeoForge { if (ruleType == GameRuleType.BOOL || ruleType == GameRuleType.INT) return; - GameRuleEntryFactory factory = (GameRuleEntryFactory) Accessor_GameRuleEntryFactoryManager.greenhouse_config_extensions_gamerules$getFACTORIES() + GameRuleEntryFactory factory = (GameRuleEntryFactory) Accessor_GameRuleEntryFactoryManager.config_extensions_gamerules$getFACTORIES() .getOrDefault(ruleType, GenericGameRuleEntry::new); ruleEntry.setValue(factory.create(screen, component, tooltip, narration, rule)); diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java similarity index 80% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java index 90fd53f..b993554 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Accessor_GameRuleEntryFactoryManager.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.mixin.client; import net.minecraft.world.level.gamerules.GameRuleType; import net.neoforged.neoforge.client.gamerules.GameRuleEntryFactory; @@ -19,7 +19,7 @@ import java.util.Map; @Mixin(GameRuleEntryFactoryManager.class) public interface Accessor_GameRuleEntryFactoryManager { @Accessor("FACTORIES") - static Map> greenhouse_config_extensions_gamerules$getFACTORIES() { + static Map> config_extensions_gamerules$getFACTORIES() { throw new AssertionError("Implemented via mixin."); } } diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java similarity index 77% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java index 61fda46..f80ea0a 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList.java @@ -6,11 +6,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.mixin.client; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.GreenhouseConfigExtensionsGameRulesNeoForge; +import org.vulpixel.config_extensions.gamerules.neoforge.impl.GreenhouseConfigExtensionsGameRulesNeoForge; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.world.level.gamerules.GameRuleTypeVisitor; import net.minecraft.world.level.gamerules.GameRules; @@ -20,7 +20,7 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(AbstractGameRulesScreen.RuleList.class) public class Mixin_AbstractGameRulesScreenRuleList { @WrapOperation(method = "populateChildren", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/gamerules/GameRules;visitGameRuleTypes(Lnet/minecraft/world/level/gamerules/GameRuleTypeVisitor;)V")) - private void greenhouse_config_extensions_gamerules$captureTypeVisitor(GameRules instance, GameRuleTypeVisitor visitor, Operation original) { + private void config_extensions_gamerules$captureTypeVisitor(GameRules instance, GameRuleTypeVisitor visitor, Operation original) { ScopedValue.where(GreenhouseConfigExtensionsGameRulesNeoForge.TYPE_VISITOR, visitor) .run(() -> original.call(instance, visitor)); } diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java similarity index 83% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java index 58a4614..e7a8512 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java @@ -6,11 +6,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.mixin.client; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; -import lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.client.GreenhouseConfigExtensionsGameRulesClientNeoForge; +import org.vulpixel.config_extensions.gamerules.impl.client.GreenhouseConfigExtensionsGameRulesClient; +import org.vulpixel.config_extensions.gamerules.neoforge.impl.client.GreenhouseConfigExtensionsGameRulesClientNeoForge; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.network.chat.Component; import net.minecraft.util.FormattedCharSequence; @@ -25,7 +25,7 @@ import java.util.List; @Mixin(targets = "net/minecraft/client/gui/screens/worldselection/AbstractGameRulesScreen$RuleList$1") public abstract class Mixin_AbstractGameRulesScreenRuleList1 { @Inject(method = "addEntry(Lnet/minecraft/world/level/gamerules/GameRule;Lnet/minecraft/client/gui/screens/worldselection/AbstractGameRulesScreen$EntryFactory;)V", at = @At(value = "INVOKE", target = "java/util/Map.computeIfAbsent (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;"), cancellable = true) - private void greenhouse_config_extensions_gamerules$collectInnerEntry(final GameRule gameRule, + private void config_extensions_gamerules$collectInnerEntry(final GameRule gameRule, final AbstractGameRulesScreen.EntryFactory factory, CallbackInfo ci, @Local(ordinal = 0) Component readableName, diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/package-info.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/package-info.java similarity index 85% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/package-info.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/package-info.java index 475ddf9..c3ff7f8 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/package-info.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/package-info.java @@ -1,4 +1,3 @@ - /* * Copyright © 2026 Greenhouse Modding * @@ -9,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.client; +package org.vulpixel.config_extensions.gamerules.neoforge.impl; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java similarity index 77% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java index a8c84bc..2b0eecd 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge.java @@ -6,13 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.platform; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.platform; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.Platform; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; +import org.vulpixel.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; +import org.vulpixel.config_extensions.gamerules.impl.platform.Platform; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/package-info.java b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/package-info.java similarity index 84% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/package-info.java rename to gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/package-info.java index f0f3b0f..346c57f 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/client/package-info.java +++ b/gamerules/neoforge/src/main/java/org/vulpixel/config_extensions/gamerules/neoforge/impl/platform/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.client; +package org.vulpixel.config_extensions.gamerules.neoforge.impl.platform; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.cfg b/gamerules/neoforge/src/main/resources/config_extensions_gamerules.cfg similarity index 100% rename from gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.cfg rename to gamerules/neoforge/src/main/resources/config_extensions_gamerules.cfg diff --git a/gamerules/neoforge/src/main/resources/config_extensions_gamerules.neoforge.mixins.json b/gamerules/neoforge/src/main/resources/config_extensions_gamerules.neoforge.mixins.json new file mode 100644 index 0000000..d8da80a --- /dev/null +++ b/gamerules/neoforge/src/main/resources/config_extensions_gamerules.neoforge.mixins.json @@ -0,0 +1,19 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "org.vulpixel.config_extensions.gamerules.neoforge.impl.mixin", + "compatibilityLevel": "JAVA_25", + "mixins": [ + "client.Mixin_AbstractGameRulesScreenRuleList", + "client.Mixin_AbstractGameRulesScreenRuleList1", + "client.Accessor_GameRuleEntryFactoryManager" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "mixinextras": { + "minVersion": "0.5.0" + } +} diff --git a/gamerules/neoforge/src/main/resources/config_extensions_gamerules_extensions.json b/gamerules/neoforge/src/main/resources/config_extensions_gamerules_extensions.json new file mode 100644 index 0000000..a02d89e --- /dev/null +++ b/gamerules/neoforge/src/main/resources/config_extensions_gamerules_extensions.json @@ -0,0 +1,10 @@ +{ + "entries": [ + { + "enum": "net/minecraft/world/level/gamerules/GameRuleType", + "name": "CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG", + "constructor": "(Ljava/lang/String;)V", + "parameters": [ "config_extensions_gamerules:via_config" ] + } + ] +} \ No newline at end of file diff --git a/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.neoforge.mixins.json b/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.neoforge.mixins.json deleted file mode 100644 index 1655ebd..0000000 --- a/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules.neoforge.mixins.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.mixin", - "compatibilityLevel": "JAVA_25", - "mixins": [ - "client.Mixin_AbstractGameRulesScreenRuleList", - "client.Mixin_AbstractGameRulesScreenRuleList1", - "client.Accessor_GameRuleEntryFactoryManager" - ], - "client": [ - ], - "injectors": { - "defaultRequire": 1 - }, - "mixinextras": { - "minVersion": "0.5.0" - } -} diff --git a/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules_extensions.json b/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules_extensions.json deleted file mode 100644 index d77222b..0000000 --- a/gamerules/neoforge/src/main/resources/greenhouse_config_extensions_gamerules_extensions.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "entries": [ - { - "enum": "net/minecraft/world/level/gamerules/GameRuleType", - "name": "GREENHOUSE_CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG", - "constructor": "(Ljava/lang/String;)V", - "parameters": [ "greenhouse_config_extensions_gamerules:via_config" ] - } - ] -} \ No newline at end of file diff --git a/gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java b/gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java similarity index 86% rename from gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java rename to gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java index 1f6f3ae..40e4072 100644 --- a/gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java +++ b/gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/GreenhouseConfigExtensionsGameRulesTestmodNeoForge.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.testmod; +package org.vulpixel.config_extensions.gamerules.neoforge.testmod; -import lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; +import org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; import net.minecraft.core.registries.Registries; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; diff --git a/gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java b/gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java similarity index 73% rename from gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java rename to gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java index 18d2c3d..464b671 100644 --- a/gamerules/neoforge/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java +++ b/gamerules/neoforge/src/testmod/java/org/vulpixel/config_extensions/gamerules/neoforge/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.neoforge.testmod.platform; +package org.vulpixel.config_extensions.gamerules.neoforge.testmod.platform; -import lgbt.greenhouse.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; +import org.vulpixel.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; import net.neoforged.fml.loading.FMLPaths; import java.nio.file.Path; diff --git a/gamerules/xplat/build.gradle.kts b/gamerules/xplat/build.gradle.kts index 0b0d5e3..47b086f 100644 --- a/gamerules/xplat/build.gradle.kts +++ b/gamerules/xplat/build.gradle.kts @@ -1,27 +1,4 @@ -import lgbt.greenhouse.config_extensions.gradle.Properties - plugins { - id("lgbt.greenhouse.config_extensions.gradle.platform.xplat") + id("org.vulpixel.config_extensions.gradle.platform.xplat") alias(libs.plugins.mod.publish) } - -val props = project.ext["props"] as Properties.ModuleProperties - -// TODO: Move me to a general publish module. -publishMods { - changelog = rootProject.file("CHANGELOG.md").readText() - displayName = "v${props.version} (Minecraft ${Properties.FRIENDLY_MINECRAFT_VERSION})" - version = "${props.version}+${Properties.FRIENDLY_MINECRAFT_VERSION}" - type = STABLE - - modLoaders.addAll("fabric", "neoforge") - file.set(tasks.getByName("mergeJar").archiveFile) - - forgejo { - accessToken = providers.environmentVariable("FORGEJO_TOKEN") - host(uri(Properties.FORGEJO_URL)) - repository = Properties.FORGEJO_REPO - tagName = "${Properties.MOD_VERSION}+${Properties.FRIENDLY_MINECRAFT_VERSION}" - commitish = Properties.FORGEJO_COMMITISH - } -} diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/package-info.java b/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/package-info.java deleted file mode 100644 index 9a9d91b..0000000 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.client.network; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java b/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java deleted file mode 100644 index 0792662..0000000 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.client.screen.gamerule; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/package-info.java b/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/package-info.java deleted file mode 100644 index 307c755..0000000 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.client.screen; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/package-info.java b/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/package-info.java deleted file mode 100644 index ebfd1f8..0000000 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.network; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java similarity index 81% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java index acd4175..a1ca575 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/ViaConfigGameRule.java @@ -6,14 +6,14 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule; +package org.vulpixel.config_extensions.gamerules.api.v1.gamerule; import com.mojang.serialization.DataResult; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.NullableCodec; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentType; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRuleTypeVisitor; -import lgbt.greenhouse.config_extensions.gamerules.impl.mixin.Accessor_GameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.NullableCodec; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentType; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRuleTypeVisitor; +import org.vulpixel.config_extensions.gamerules.impl.mixin.Accessor_GameRule; import net.minecraft.world.level.gamerules.GameRule; import net.minecraft.world.level.gamerules.GameRuleType; import net.minecraft.world.level.gamerules.GameRuleTypeVisitor; @@ -53,13 +53,13 @@ public class ViaConfigGameRule extends GameRule { ); //noinspection unchecked - ((Accessor_GameRule) this).greenhouse_config_extensions_gamerules$setArgument(new ViaConfigArgumentType<>(gameRule.argument(), this)); + ((Accessor_GameRule) this).config_extensions_gamerules$setArgument(new ViaConfigArgumentType<>(gameRule.argument(), this)); this.config = config; this.fromConfig = fromConfig; //noinspection unchecked this.innerVisitorCaller = (visitor, innerRule) -> ((Accessor_GameRule) gameRule) - .greenhouse_config_extensions_gamerules$getVisitorCaller() + .config_extensions_gamerules$getVisitorCaller() .call(visitor, innerRule); this.innerGameRuleType = gameRule.gameRuleType(); } @@ -122,7 +122,7 @@ public class ViaConfigGameRule extends GameRule { visitor instanceof Duck_ViaConfigGameRuleTypeVisitor configBackedVisitor && gameRule instanceof ViaConfigGameRule viaConfigGameRule ) { - configBackedVisitor.greenhouse_config_extensions_gamerules$visitConfigBacked(viaConfigGameRule); + configBackedVisitor.config_extensions_gamerules$visitConfigBacked(viaConfigGameRule); } } } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/package-info.java similarity index 83% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/package-info.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/package-info.java index 186a7c6..6305a8e 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/api/v1/gamerule/package-info.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/api/v1/gamerule/package-info.java @@ -7,6 +7,6 @@ */ @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule; +package org.vulpixel.config_extensions.gamerules.api.v1.gamerule; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java similarity index 70% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java index bbf046e..37fb70c 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/GreenhouseConfigExtensionsGameRules.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl; +package org.vulpixel.config_extensions.gamerules.impl; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesHelperLoaders; -import lgbt.greenhouse.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; +import org.vulpixel.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesHelperLoaders; +import org.vulpixel.config_extensions.gamerules.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelper; import net.minecraft.resources.Identifier; import net.minecraft.world.level.gamerules.GameRuleType; import net.minecraft.world.level.gamerules.GameRules; @@ -18,11 +18,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class GreenhouseConfigExtensionsGameRules { - public static final String MOD_ID = "greenhouse_config_extensions_gamerules"; - public static final String MOD_NAME = "Greenhouse Config Extensions - Game Rules"; + public static final String MOD_ID = "config_extensions_gamerules"; + public static final String MOD_NAME = "Config Extensions - Game Rules"; public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); - public static final GameRuleType VIA_CONFIG_GAME_RULE_TYPE = GameRuleType.valueOf("GREENHOUSE_CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG"); + public static final GameRuleType VIA_CONFIG_GAME_RULE_TYPE = GameRuleType.valueOf("CONFIG_EXTENSIONS_GAMERULES_VIA_CONFIG"); public static final ScopedValue GAME_RULES = ScopedValue.newInstance(); diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/NullableCodec.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/NullableCodec.java similarity index 87% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/NullableCodec.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/NullableCodec.java index 616cfb1..658209d 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/NullableCodec.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/NullableCodec.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl; +package org.vulpixel.config_extensions.gamerules.impl; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Codec; @@ -14,7 +14,7 @@ import com.mojang.serialization.DataResult; import com.mojang.serialization.DynamicOps; import org.jspecify.annotations.Nullable; -public class NullableCodec implements Codec<@Nullable E> { +public class NullableCodec implements Codec { private final Codec codec; protected NullableCodec(Codec codec) { @@ -27,7 +27,7 @@ public class NullableCodec implements Codec<@Nullable E> { @Override public DataResult> decode(DynamicOps ops, T input) { - if (input == ops.emptyMap()) { + if (input.equals(ops.emptyMap())) { return DataResult.success(Pair.of(null, input)); } return codec.decode(ops, input); diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java similarity index 87% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java index 1335d88..0fe1489 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/GreenhouseConfigExtensionsGameRulesClient.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.client; +package org.vulpixel.config_extensions.gamerules.impl.client; import net.minecraft.util.Unit; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java similarity index 57% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java index 193b93a..ebe5b92 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/GreenhouseConfigClientboundPacketHandlers.java @@ -6,13 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.client.network; +package org.vulpixel.config_extensions.gamerules.impl.client.network; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client.Accessor_AbstractGameRulesScreen; -import lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client.Accessor_InWorldGameRulesScreen; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.mixin.client.Accessor_AbstractGameRulesScreen; +import org.vulpixel.config_extensions.gamerules.impl.mixin.client.Accessor_InWorldGameRulesScreen; +import org.vulpixel.config_extensions.gamerules.impl.network.clientbound.SendViaConfigValueGameRulesClientboundPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.options.InWorldGameRulesScreen; import net.minecraft.core.registries.BuiltInRegistries; @@ -29,9 +29,9 @@ public class GreenhouseConfigClientboundPacketHandlers { continue; } - ((Accessor_InWorldGameRulesScreen) inWorldGameRulesScreen).greenhouse_config_extensions_gamerules$getServerProvidedRules().add(gameRule); - ((Accessor_InWorldGameRulesScreen) inWorldGameRulesScreen).greenhouse_config_extensions_gamerules$getInitialValues().set(gameRule, null); - ((Accessor_AbstractGameRulesScreen) inWorldGameRulesScreen).greenhouse_config_extensions_gamerules$getGameRules().set(gameRule, null, null); + ((Accessor_InWorldGameRulesScreen) inWorldGameRulesScreen).config_extensions_gamerules$getServerProvidedRules().add(gameRule); + ((Accessor_InWorldGameRulesScreen) inWorldGameRulesScreen).config_extensions_gamerules$getInitialValues().set(gameRule, null); + ((Accessor_AbstractGameRulesScreen) inWorldGameRulesScreen).config_extensions_gamerules$getGameRules().set(gameRule, null, null); } } diff --git a/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/package-info.java new file mode 100644 index 0000000..bd0da3a --- /dev/null +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/network/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.impl.client.network; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/package-info.java similarity index 86% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/package-info.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/package-info.java index 4a72ba4..2ab9f91 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/package-info.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/package-info.java @@ -1,3 +1,4 @@ + /* * Copyright © 2026 Greenhouse Modding * @@ -8,7 +9,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl; +package org.vulpixel.config_extensions.gamerules.impl.client; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java similarity index 84% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java index f60785a..28b3976 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/ViaConfigGameRuleEntry.java @@ -6,12 +6,12 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.client.screen.gamerule; +package org.vulpixel.config_extensions.gamerules.impl.client.screen.gamerule; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client.Accessor_AbstractGameRulesScreen; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; +import org.vulpixel.config_extensions.gamerules.impl.mixin.client.Accessor_AbstractGameRulesScreen; import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.components.*; import net.minecraft.client.gui.components.events.GuiEventListener; @@ -33,8 +33,8 @@ public class ViaConfigGameRuleEntry extends AbstractGameRulesScreen.GameRuleE GreenhouseConfigExtensionsGameRules.id("gamerule/config_value_enabled_highlighted"), GreenhouseConfigExtensionsGameRules.id("gamerule/config_value_disabled_highlighted") ); - private static final Component ENABLED_TEXT = Component.translatable("editGamerule.greenhouse_config_extensions_gamerules.toggle_config_enabled"); - private static final Component DISABLED_TEXT = Component.translatable("editGamerule.greenhouse_config_extensions_gamerules.toggle_config_disabled"); + private static final Component ENABLED_TEXT = Component.translatable("editGamerule.config_extensions_gamerules.toggle_config_enabled"); + private static final Component DISABLED_TEXT = Component.translatable("editGamerule.config_extensions_gamerules.toggle_config_disabled"); private final AbstractGameRulesScreen.RuleEntry inner; private final CycleButton checkbox; @@ -50,7 +50,7 @@ public class ViaConfigGameRuleEntry extends AbstractGameRulesScreen.GameRuleE Component label) { screen.super(tooltip, label); - GameRules gameRules = ((Accessor_AbstractGameRulesScreen)screen).greenhouse_config_extensions_gamerules$getGameRules(); + GameRules gameRules = ((Accessor_AbstractGameRulesScreen)screen).config_extensions_gamerules$getGameRules(); this.inner = inner; configValueSetter = v -> { @@ -63,7 +63,7 @@ public class ViaConfigGameRuleEntry extends AbstractGameRulesScreen.GameRuleE setInnerActive(); }; - isConfigDefault = ((Duck_ViaConfigGameRules)gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(gameRule); + isConfigDefault = ((Duck_ViaConfigGameRules)gameRules).config_extensions_gamerules$isUsingConfig(gameRule); checkbox = CycleButton.onOffBuilder(isConfigDefault) .displayOnlyValue() .withSprite((button, bool) -> SPRITES.get(bool, button.isHoveredOrFocused())) diff --git a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java similarity index 83% rename from gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/package-info.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java index 1ac04ee..edc958a 100644 --- a/gamerules/fabric/src/main/java/lgbt/greenhouse/config_extensions/gamerules/fabric/impl/platform/package-info.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/gamerule/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.fabric.impl.platform; +package org.vulpixel.config_extensions.gamerules.impl.client.screen.gamerule; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/package-info.java similarity index 85% rename from gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/package-info.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/package-info.java index ada79d7..abce424 100644 --- a/gamerules/neoforge/src/main/java/lgbt/greenhouse/config_extensions/gamerules/neoforge/impl/package-info.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/client/screen/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.neoforge.impl; +package org.vulpixel.config_extensions.gamerules.impl.client.screen; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java similarity index 94% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java index 1bd56a6..5552c2d 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentType.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.command; +package org.vulpixel.config_extensions.gamerules.impl.command; import com.mojang.brigadier.StringReader; import com.mojang.brigadier.arguments.ArgumentType; @@ -15,7 +15,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.suggestion.Suggestion; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; import net.minecraft.util.Unit; import org.jspecify.annotations.Nullable; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java similarity index 96% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java index 09bf2a3..e95c447 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/ViaConfigArgumentTypeInfo.java @@ -6,11 +6,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.command; +package org.vulpixel.config_extensions.gamerules.impl.command; import com.google.gson.JsonObject; import com.mojang.brigadier.arguments.ArgumentType; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; import net.minecraft.commands.CommandBuildContext; import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.commands.synchronization.ArgumentTypeInfos; diff --git a/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/package-info.java new file mode 100644 index 0000000..9ac6b7d --- /dev/null +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/command/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.impl.command; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java similarity index 55% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java index 41d3315..1726381 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRuleTypeVisitor.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.duck; +package org.vulpixel.config_extensions.gamerules.impl.duck; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; public interface Duck_ViaConfigGameRuleTypeVisitor { - void greenhouse_config_extensions_gamerules$visitConfigBacked(final ViaConfigGameRule viaConfigGameRule); + void config_extensions_gamerules$visitConfigBacked(final ViaConfigGameRule viaConfigGameRule); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java similarity index 71% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java index a268c1b..7f50266 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/Duck_ViaConfigGameRules.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.duck; +package org.vulpixel.config_extensions.gamerules.impl.duck; import net.minecraft.world.level.gamerules.GameRule; public interface Duck_ViaConfigGameRules { - boolean greenhouse_config_extensions_gamerules$isUsingConfig(GameRule gameRule); + boolean config_extensions_gamerules$isUsingConfig(GameRule gameRule); } diff --git a/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/package-info.java new file mode 100644 index 0000000..70ac6a1 --- /dev/null +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/duck/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.impl.duck; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java similarity index 76% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java index 2ec7813..7de484f 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Accessor_GameRule.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin; +package org.vulpixel.config_extensions.gamerules.impl.mixin; import com.mojang.brigadier.arguments.ArgumentType; import net.minecraft.world.level.gamerules.GameRule; @@ -19,10 +19,10 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(GameRule.class) public interface Accessor_GameRule { @Accessor("visitorCaller") - GameRules.VisitorCaller greenhouse_config_extensions_gamerules$getVisitorCaller(); + GameRules.VisitorCaller config_extensions_gamerules$getVisitorCaller(); @Accessor("argument") @Final @Mutable - void greenhouse_config_extensions_gamerules$setArgument(ArgumentType value); + void config_extensions_gamerules$setArgument(ArgumentType value); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java similarity index 63% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java index 2794349..f33950a 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRuleCommand.java @@ -6,16 +6,16 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin; +package org.vulpixel.config_extensions.gamerules.impl.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.brigadier.context.CommandContext; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.command.ViaConfigArgumentType; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.command.ViaConfigArgumentType; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; import net.minecraft.server.commands.GameRuleCommand; @@ -29,7 +29,7 @@ import java.util.function.Supplier; @Mixin(GameRuleCommand.class) public class Mixin_GameRuleCommand { @WrapOperation(method = "setRule", at = @At(value = "INVOKE", target = "Lcom/mojang/brigadier/context/CommandContext;getArgument(Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;")) - private static V greenhouse_config_extensions_gamerules$nullableValueForSetRule(CommandContext instance, String name, Class clazz, Operation original, @Local(argsOnly = true) GameRule gameRule) { + private static V config_extensions_gamerules$nullableValueForSetRule(CommandContext instance, String name, Class clazz, Operation original, @Local(argsOnly = true) GameRule gameRule) { V value = original.call(instance, name, clazz); // A hack bc NeoForge does not allow for mixins to internal Minecraft libraries @@ -43,36 +43,36 @@ public class Mixin_GameRuleCommand { } @WrapOperation(method = "setRule", at = @At(value = "INVOKE", target = "Lnet/minecraft/commands/CommandSourceStack;sendSuccess(Ljava/util/function/Supplier;Z)V")) - private static void greenhouse_config_extensions_gamerules$scopeCommandSourceForSet(CommandSourceStack instance, Supplier messageSupplier, boolean broadcast, Operation original) { + private static void config_extensions_gamerules$scopeCommandSourceForSet(CommandSourceStack instance, Supplier messageSupplier, boolean broadcast, Operation original) { ScopedValue.where(GreenhouseConfigExtensionsGameRules.GAME_RULES, instance.getLevel().getGameRules()) .run(() -> original.call(instance, messageSupplier, broadcast)); } @ModifyArg(method = "lambda$setRule$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/Component;translatable(Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/network/chat/MutableComponent;"), index = 1) - private static Object[] greenhouse_config_extensions_gamerules$setWithConfigValue(Object[] args, @Local(argsOnly = true) GameRule gameRule) { + private static Object[] config_extensions_gamerules$setWithConfigValue(Object[] args, @Local(argsOnly = true) GameRule gameRule) { if ( GreenhouseConfigExtensionsGameRules.GAME_RULES.isBound() - && ((Duck_ViaConfigGameRules) GreenhouseConfigExtensionsGameRules.GAME_RULES.get()).greenhouse_config_extensions_gamerules$isUsingConfig(gameRule) + && ((Duck_ViaConfigGameRules) GreenhouseConfigExtensionsGameRules.GAME_RULES.get()).config_extensions_gamerules$isUsingConfig(gameRule) && gameRule instanceof ViaConfigGameRule viaConfigGameRule ) { - args[1] = Component.translatable("editGamerule.greenhouse_config_extensions_gamerules.via_config", gameRule.serialize(viaConfigGameRule.configValue())); + args[1] = Component.translatable("editGamerule.config_extensions_gamerules.via_config", gameRule.serialize(viaConfigGameRule.configValue())); } return args; } @WrapOperation(method = "queryRule", at = @At(value = "INVOKE", target = "Lnet/minecraft/commands/CommandSourceStack;sendSuccess(Ljava/util/function/Supplier;Z)V")) - private static void greenhouse_config_extensions_gamerules$scopeCommandSourceForQuery(CommandSourceStack instance, Supplier messageSupplier, boolean broadcast, Operation original) { + private static void config_extensions_gamerules$scopeCommandSourceForQuery(CommandSourceStack instance, Supplier messageSupplier, boolean broadcast, Operation original) { ScopedValue.where(GreenhouseConfigExtensionsGameRules.GAME_RULES, instance.getLevel().getGameRules()) .run(() -> original.call(instance, messageSupplier, broadcast)); } @ModifyArg(method = "lambda$queryRule$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/Component;translatable(Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/network/chat/MutableComponent;"), index = 1) - private static Object[] greenhouse_config_extensions_gamerules$queryWithConfigValue(Object[] args, @Local(argsOnly = true) GameRule gameRule) { + private static Object[] config_extensions_gamerules$queryWithConfigValue(Object[] args, @Local(argsOnly = true) GameRule gameRule) { if ( GreenhouseConfigExtensionsGameRules.GAME_RULES.isBound() - && ((Duck_ViaConfigGameRules) GreenhouseConfigExtensionsGameRules.GAME_RULES.get()).greenhouse_config_extensions_gamerules$isUsingConfig(gameRule) + && ((Duck_ViaConfigGameRules) GreenhouseConfigExtensionsGameRules.GAME_RULES.get()).config_extensions_gamerules$isUsingConfig(gameRule) ) { - args[1] = Component.translatable("editGamerule.greenhouse_config_extensions_gamerules.via_config", args[1]); + args[1] = Component.translatable("editGamerule.config_extensions_gamerules.via_config", args[1]); } return args; } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java similarity index 75% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java index d883e43..dffd29c 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_GameRules.java @@ -6,15 +6,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin; +package org.vulpixel.config_extensions.gamerules.impl.mixin; import com.llamalad7.mixinextras.expression.Definition; import com.llamalad7.mixinextras.expression.Expression; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; import net.minecraft.world.level.gamerules.GameRule; import net.minecraft.world.level.gamerules.GameRuleMap; import net.minecraft.world.level.gamerules.GameRules; @@ -33,7 +33,7 @@ public class Mixin_GameRules implements Duck_ViaConfigGameRules { @Definition(id = "get", method = "Lnet/minecraft/world/level/gamerules/GameRuleMap;get(Lnet/minecraft/world/level/gamerules/GameRule;)Ljava/lang/Object;") @Expression("? = ?.get(?)") @ModifyVariable(method = "get", at = @At(value = "MIXINEXTRAS:EXPRESSION", shift = At.Shift.AFTER), name = "value") - private T greenhouse_config_extensions_gamerules$configValueWhenNull(T value, GameRule gameRule) { + private T config_extensions_gamerules$configValueWhenNull(T value, GameRule gameRule) { if ( gameRule instanceof ViaConfigGameRule viaConfigGameRule && rules.has(gameRule) @@ -46,8 +46,8 @@ public class Mixin_GameRules implements Duck_ViaConfigGameRules { } @WrapOperation(method = "setFromOther", at = @At(value = "INVOKE", target = "Ljava/util/Objects;requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;")) - private T greenhouse_config_extensions_gamerules$dontRequireNonNull(T obj, Operation original, @Local(argsOnly = true) GameRule gameRule) { - if (greenhouse_config_extensions_gamerules$isUsingConfig(gameRule)) { + private T config_extensions_gamerules$dontRequireNonNull(T obj, Operation original, @Local(argsOnly = true) GameRule gameRule) { + if (config_extensions_gamerules$isUsingConfig(gameRule)) { // I'm null, and that's non-null. I will never be non-null but that's not null. There's no one I'd rather be than me. return obj; } @@ -56,7 +56,7 @@ public class Mixin_GameRules implements Duck_ViaConfigGameRules { } @Override - public boolean greenhouse_config_extensions_gamerules$isUsingConfig(GameRule gameRule) { + public boolean config_extensions_gamerules$isUsingConfig(GameRule gameRule) { return gameRule instanceof ViaConfigGameRule && rules.has(gameRule) && rules.get(gameRule) == null; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java similarity index 70% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java index d28a54a..2fb862c 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/Mixin_ServerGamePacketListenerImpl.java @@ -6,13 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin; +package org.vulpixel.config_extensions.gamerules.impl.mixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; @@ -35,10 +35,10 @@ public class Mixin_ServerGamePacketListenerImpl { public ServerPlayer player; @Inject(method = "sendGameRuleValues", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) - private void greenhouse_config_extensions_gamerules$sendGameRules(CallbackInfo ci, @Local(name = "gameRules") GameRules gameRules) { + private void config_extensions_gamerules$sendGameRules(CallbackInfo ci, @Local(name = "gameRules") GameRules gameRules) { Set>> toSend = new HashSet<>(); gameRules.availableRules() - .filter(gameRule -> ((Duck_ViaConfigGameRules) gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(gameRule)) + .filter(gameRule -> ((Duck_ViaConfigGameRules) gameRules).config_extensions_gamerules$isUsingConfig(gameRule)) .forEach(gameRule -> toSend.add(BuiltInRegistries.GAME_RULE.getResourceKey(gameRule).orElseThrow())); if (!toSend.isEmpty()) { GreenhouseConfigExtensionsGameRules.getPlatformHelper().sendViaConfigValueGameRulesClientbound(toSend, player); @@ -46,8 +46,8 @@ public class Mixin_ServerGamePacketListenerImpl { } @WrapOperation(method = "lambda$addGameRuleValue$0", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) - private static V greenhouse_config_extensions_gamerules$cancelSendingConfigValueGameRules(Map instance, K k, V v, Operation original, @Local(argsOnly = true) GameRules gameRules, @Local(argsOnly = true) GameRule rule) { - if (((Duck_ViaConfigGameRules)gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(rule)) { + private static V config_extensions_gamerules$cancelSendingConfigValueGameRules(Map instance, K k, V v, Operation original, @Local(argsOnly = true) GameRules gameRules, @Local(argsOnly = true) GameRule rule) { + if (((Duck_ViaConfigGameRules)gameRules).config_extensions_gamerules$isUsingConfig(rule)) { return null; } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java similarity index 81% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java index 311bf39..8401d29 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_AbstractGameRulesScreen.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.impl.mixin.client; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.world.level.gamerules.GameRules; @@ -16,5 +16,5 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(AbstractGameRulesScreen.class) public interface Accessor_AbstractGameRulesScreen { @Accessor("gameRules") - GameRules greenhouse_config_extensions_gamerules$getGameRules(); + GameRules config_extensions_gamerules$getGameRules(); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java similarity index 76% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java index a64f668..af257d8 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Accessor_InWorldGameRulesScreen.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.impl.mixin.client; import net.minecraft.client.gui.screens.options.InWorldGameRulesScreen; import net.minecraft.world.level.gamerules.GameRule; @@ -19,8 +19,8 @@ import java.util.List; @Mixin(InWorldGameRulesScreen.class) public interface Accessor_InWorldGameRulesScreen { @Accessor("initialValues") - GameRuleMap greenhouse_config_extensions_gamerules$getInitialValues(); + GameRuleMap config_extensions_gamerules$getInitialValues(); @Accessor("serverProvidedRules") - List> greenhouse_config_extensions_gamerules$getServerProvidedRules(); + List> config_extensions_gamerules$getServerProvidedRules(); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java similarity index 71% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java index 344e0c7..d398edf 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_AbstractGameRulesScreenRuleList1.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.impl.mixin.client; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; import net.minecraft.network.chat.Component; import net.minecraft.world.level.gamerules.GameRule; import org.spongepowered.asm.mixin.Mixin; @@ -19,9 +19,9 @@ import org.spongepowered.asm.mixin.injection.ModifyArg; @Mixin(targets = "net/minecraft/client/gui/screens/worldselection/AbstractGameRulesScreen$RuleList$1") public abstract class Mixin_AbstractGameRulesScreenRuleList1 { @ModifyArg(method = "addEntry(Lnet/minecraft/world/level/gamerules/GameRule;Lnet/minecraft/client/gui/screens/worldselection/AbstractGameRulesScreen$EntryFactory;)V", at = @At(value = "INVOKE", target = "net/minecraft/network/chat/Component.translatable(Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/network/chat/MutableComponent;"), index = 1) - private Object[] greenhouse_config_extensions_gamerules$useConfigDefaultForTranslation(Object[] args, @Local(argsOnly = true) GameRule gameRule) { + private Object[] config_extensions_gamerules$useConfigDefaultForTranslation(Object[] args, @Local(argsOnly = true) GameRule gameRule) { if (gameRule instanceof ViaConfigGameRule configBacked) { - args[0] = Component.translatable( "editGamerule.greenhouse_config_extensions_gamerules.via_config", configBacked.serialize(configBacked.configValue())); + args[0] = Component.translatable( "editGamerule.config_extensions_gamerules.via_config", configBacked.serialize(configBacked.configValue())); } return args; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java similarity index 68% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java index 7e19781..8ff7fba 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/mixin/client/Mixin_InWorldGameRulesScreen.java @@ -6,15 +6,15 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.mixin.client; +package org.vulpixel.config_extensions.gamerules.impl.mixin.client; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.duck.Duck_ViaConfigGameRules; import net.minecraft.client.gui.screens.options.InWorldGameRulesScreen; import net.minecraft.client.gui.screens.worldselection.AbstractGameRulesScreen; import net.minecraft.core.Registry; @@ -49,10 +49,10 @@ public abstract class Mixin_InWorldGameRulesScreen extends AbstractGameRulesScre } @Inject(method = "onDone", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/options/InWorldGameRulesScreen;closeAndApplyChanges()V")) - private void greenhouse_config_extensions_gamerules$sendGameRulesBackToServer(CallbackInfo ci) { + private void config_extensions_gamerules$sendGameRulesBackToServer(CallbackInfo ci) { Set>> toSend = new HashSet<>(); gameRules.availableRules() - .filter(gameRule -> hasGameRuleChanged(gameRule) && ((Duck_ViaConfigGameRules) gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(gameRule)) + .filter(gameRule -> hasGameRuleChanged(gameRule) && ((Duck_ViaConfigGameRules) gameRules).config_extensions_gamerules$isUsingConfig(gameRule)) .forEach(gameRule -> toSend.add(BuiltInRegistries.GAME_RULE.getResourceKey(gameRule).orElseThrow())); if (!toSend.isEmpty()) { GreenhouseConfigExtensionsGameRules.getPlatformHelper().sendViaConfigValueGameRulesServerbound(toSend); @@ -60,17 +60,17 @@ public abstract class Mixin_InWorldGameRulesScreen extends AbstractGameRulesScre } @ModifyReturnValue(method = "hasGameRuleChanged", at = @At("RETURN")) - private boolean greenhouse_config_extensions_gamerules$setGameRuleChanged(boolean original, @Local(argsOnly = true) GameRule rule) { + private boolean config_extensions_gamerules$setGameRuleChanged(boolean original, @Local(argsOnly = true) GameRule rule) { if (rule instanceof ViaConfigGameRule) { - return ((Duck_ViaConfigGameRules)gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(rule) ^ (initialValues.get(rule) == null) - || !((Duck_ViaConfigGameRules)gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(rule) && original; + return ((Duck_ViaConfigGameRules)gameRules).config_extensions_gamerules$isUsingConfig(rule) ^ (initialValues.get(rule) == null) + || !((Duck_ViaConfigGameRules)gameRules).config_extensions_gamerules$isUsingConfig(rule) && original; } return original; } @WrapOperation(method = "collectChangedGameRule", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/Registry;getResourceKey(Ljava/lang/Object;)Ljava/util/Optional;")) - private Optional> greenhouse_config_extensions_gamerules$cancelSendingConfigValueGameRules(Registry instance, T t, Operation>> original, @Local(argsOnly = true) GameRule rule) { - if (((Duck_ViaConfigGameRules)gameRules).greenhouse_config_extensions_gamerules$isUsingConfig(rule)) { + private Optional> config_extensions_gamerules$cancelSendingConfigValueGameRules(Registry instance, T t, Operation>> original, @Local(argsOnly = true) GameRule rule) { + if (((Duck_ViaConfigGameRules)gameRules).config_extensions_gamerules$isUsingConfig(rule)) { return Optional.empty(); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java similarity index 77% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java index 988e97d..81cf5e4 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers.java @@ -6,11 +6,11 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.network; +package org.vulpixel.config_extensions.gamerules.impl.network; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; -import lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.network.serverbound.SendViaConfigValueGameRulesServerboundPacket; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; @@ -32,7 +32,7 @@ public class GreenhouseConfigExtensionsGameRulesServerboundPacketHandlers { if (rule instanceof ViaConfigGameRule viaConfigRule) { gameRules.set(rule, null, player.level().getServer()); - Component message = Component.translatable("commands.gamerule.set", rule.id(), Component.translatable("editGamerule.greenhouse_config_extensions_gamerules.via_config", viaConfigRule.serialize(null))); + Component message = Component.translatable("commands.gamerule.set", rule.id(), Component.translatable("editGamerule.config_extensions_gamerules.via_config", viaConfigRule.serialize(null))); PlayerList playerList = player.level().getServer().getPlayerList(); playerList.getPlayers().stream().filter(op -> playerList.isOp(op.nameAndId())).forEach(op -> op.sendSystemMessage(message)); } diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java similarity index 90% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java index 22a2b98..e40a9a9 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/clientbound/SendViaConfigValueGameRulesClientboundPacket.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.network.clientbound; +package org.vulpixel.config_extensions.gamerules.impl.network.clientbound; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/package-info.java new file mode 100644 index 0000000..ee8e319 --- /dev/null +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.impl.network; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java similarity index 90% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java index 70e6a4e..d2ecef8 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/network/serverbound/SendViaConfigValueGameRulesServerboundPacket.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.network.serverbound; +package org.vulpixel.config_extensions.gamerules.impl.network.serverbound; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; import net.minecraft.core.registries.Registries; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.ByteBufCodecs; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/package-info.java similarity index 87% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/package-info.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/package-info.java index 62c01a2..76c4648 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/package-info.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl; +package org.vulpixel.config_extensions.gamerules.impl; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java similarity index 83% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java index 55dcc66..e2fe736 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesHelperLoaders.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.platform; +package org.vulpixel.config_extensions.gamerules.impl.platform; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.Nullable; @@ -19,8 +19,8 @@ import java.lang.invoke.MethodType; /// We have {@link java.util.ServiceLoader}s at home. @ApiStatus.Internal public class GreenhouseConfigExtensionsGameRulesHelperLoaders { - private static final String FABRIC_CLASS = "lgbt.greenhouse.config_extensions.gamerules.fabric.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelperFabric"; - private static final String NEOFORGE_CLASS = "lgbt.greenhouse.config_extensions.gamerules.neoforge.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge"; + private static final String FABRIC_CLASS = "org.vulpixel.config_extensions.gamerules.fabric.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelperFabric"; + private static final String NEOFORGE_CLASS = "org.vulpixel.config_extensions.gamerules.neoforge.impl.platform.GreenhouseConfigExtensionsGameRulesPlatformHelperNeoForge"; @Nullable public static final MethodHandle FABRIC_PLATFORM_HELPER = find(lookup -> { diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java similarity index 95% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java index b5fb0a6..2261a32 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/GreenhouseConfigExtensionsGameRulesPlatformHelper.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.platform; +package org.vulpixel.config_extensions.gamerules.impl.platform; import net.minecraft.resources.ResourceKey; import net.minecraft.server.level.ServerPlayer; diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/Platform.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/Platform.java similarity index 82% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/Platform.java rename to gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/Platform.java index a6bf2e3..e55355c 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/Platform.java +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/Platform.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.platform; +package org.vulpixel.config_extensions.gamerules.impl.platform; public enum Platform { FABRIC, diff --git a/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/package-info.java b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/package-info.java new file mode 100644 index 0000000..679216f --- /dev/null +++ b/gamerules/xplat/src/main/java/org/vulpixel/config_extensions/gamerules/impl/platform/package-info.java @@ -0,0 +1,14 @@ +/* + * Copyright © 2026 Greenhouse Modding + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +@ApiStatus.Internal +@NullMarked +package org.vulpixel.config_extensions.gamerules.impl.platform; + +import org.jetbrains.annotations.ApiStatus; +import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/lang/en_us.json b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/lang/en_us.json new file mode 100644 index 0000000..284ecd3 --- /dev/null +++ b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "editGamerule.config_extensions_gamerules.via_config": "%s (via Config)", + + "editGamerule.config_extensions_gamerules.toggle_config_enabled": "Using Config Value", + "editGamerule.config_extensions_gamerules.toggle_config_disabled": "Using Per-World Value" +} \ No newline at end of file diff --git a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled.png b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled.png similarity index 100% rename from gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled.png rename to gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled.png diff --git a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled_highlighted.png b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled_highlighted.png similarity index 100% rename from gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled_highlighted.png rename to gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_disabled_highlighted.png diff --git a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled.png b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled.png similarity index 100% rename from gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled.png rename to gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled.png diff --git a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled_highlighted.png b/gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled_highlighted.png similarity index 100% rename from gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled_highlighted.png rename to gamerules/xplat/src/main/resources/assets/config_extensions_gamerules/textures/gui/sprites/gamerule/config_value_enabled_highlighted.png diff --git a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/lang/en_us.json b/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/lang/en_us.json deleted file mode 100644 index ed8b353..0000000 --- a/gamerules/xplat/src/main/resources/assets/greenhouse_config_extensions_gamerules/lang/en_us.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "editGamerule.greenhouse_config_extensions_gamerules.via_config": "%s (via Config)", - - "editGamerule.greenhouse_config_extensions_gamerules.toggle_config_enabled": "Using Config Value", - "editGamerule.greenhouse_config_extensions_gamerules.toggle_config_disabled": "Using Per-World Value" -} \ No newline at end of file diff --git a/gamerules/xplat/src/main/resources/greenhouse_config_extensions_gamerules.mixins.json b/gamerules/xplat/src/main/resources/config_extensions_gamerules.mixins.json similarity index 87% rename from gamerules/xplat/src/main/resources/greenhouse_config_extensions_gamerules.mixins.json rename to gamerules/xplat/src/main/resources/config_extensions_gamerules.mixins.json index 7bb262e..e59e761 100644 --- a/gamerules/xplat/src/main/resources/greenhouse_config_extensions_gamerules.mixins.json +++ b/gamerules/xplat/src/main/resources/config_extensions_gamerules.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "lgbt.greenhouse.config_extensions.gamerules.impl.mixin", + "package": "org.vulpixel.config_extensions.gamerules.impl.mixin", "compatibilityLevel": "JAVA_25", "mixins": [ "Accessor_GameRule", diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/package-info.java b/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/package-info.java deleted file mode 100644 index 01d2780..0000000 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright © 2026 Greenhouse Modding - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.config_extensions.gamerules.testmod.platform; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java similarity index 75% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java index b04ffba..86f73bd 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/GreenhouseConfigExtensionsGameRulesTestmod.java @@ -6,21 +6,19 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod; +package org.vulpixel.config_extensions.gamerules.testmod; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.mojang.serialization.Codec; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.testmod.greenhouse.GreenhouseConfigImpl; -import lgbt.greenhouse.config_extensions.gamerules.testmod.kaleido.KaleidoConfigImpl; -import lgbt.greenhouse.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders; -import lgbt.greenhouse.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; -import lgbt.greenhouse.config_extensions.gamerules.testmod.registry.DeferredRegistry; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.testmod.greenhouse.GreenhouseConfigImpl; +import org.vulpixel.config_extensions.gamerules.testmod.kaleido.KaleidoConfigImpl; +import org.vulpixel.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders; +import org.vulpixel.config_extensions.gamerules.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper; +import org.vulpixel.config_extensions.gamerules.testmod.registry.DeferredRegistry; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.flag.FeatureFlagSet; import net.minecraft.world.level.gamerules.GameRule; import net.minecraft.world.level.gamerules.GameRuleCategory; @@ -28,7 +26,7 @@ import net.minecraft.world.level.gamerules.GameRuleType; import net.minecraft.world.level.gamerules.GameRuleTypeVisitor; public class GreenhouseConfigExtensionsGameRulesTestmod { - public static final String MOD_ID = "greenhouse_config_extensions_gamerules_testmod"; + public static final String MOD_ID = "config_extensions_gamerules_testmod"; public static final DeferredRegistry> GAME_RULE_REGISTRY = DeferredRegistry.create(BuiltInRegistries.GAME_RULE); diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java similarity index 76% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java index 67ea261..10759bd 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseConfigImpl.java @@ -6,24 +6,24 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.greenhouse; +package org.vulpixel.config_extensions.gamerules.testmod.greenhouse; import com.mojang.serialization.Codec; import lgbt.greenhouse.config.api.v3.GreenhouseConfigHolder; import lgbt.greenhouse.config.api.v3.GreenhouseConfigSide; import lgbt.greenhouse.config.api.v3.lang.GreenhouseConfigJsonCLang; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; import net.minecraft.util.ExtraCodecs; import java.util.function.Supplier; -import static lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod.GAME_RULE_REGISTRY; +import static org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod.GAME_RULE_REGISTRY; public class GreenhouseConfigImpl { public static final GreenhouseConfigHolder GREENHOUSE_GAME_RULE_CONFIG = GreenhouseConfigHolder.register( GreenhouseGameRuleConfig.class, - "greenhouse_config_extensions_gamerules_testmod/greenhouse_config", + "config_extensions_gamerules_testmod/greenhouse_config", 1, GreenhouseConfigJsonCLang.INSTANCE, GreenhouseConfigSide.COMMON, @@ -33,7 +33,7 @@ public class GreenhouseConfigImpl { """ An integer based gamerule. - Used for the value of 'greenhouse_config_extensions_gamerules_testmod:greenhouse_int' + Used for the value of 'config_extensions_gamerules_testmod:greenhouse_int' as a fallback if a per-world value is not set.""", ExtraCodecs.intRange(0, 100), 50, @@ -43,7 +43,7 @@ public class GreenhouseConfigImpl { """ A boolean based gamerule. - Used for the value of 'greenhouse_config_extensions_gamerules_testmod:greenhouse_boolean' + Used for the value of 'config_extensions_gamerules_testmod:greenhouse_boolean' as a fallback if a per-world value is not set.""", Codec.BOOL, false, diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java similarity index 84% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java index 2f00204..91081aa 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/greenhouse/GreenhouseGameRuleConfig.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.greenhouse; +package org.vulpixel.config_extensions.gamerules.testmod.greenhouse; public record GreenhouseGameRuleConfig(int intGamerule, boolean boolGamerule) { diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java similarity index 73% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java index 3ce2be6..b43b7b9 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoConfigImpl.java @@ -6,19 +6,19 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.kaleido; +package org.vulpixel.config_extensions.gamerules.testmod.kaleido; -import lgbt.greenhouse.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; -import lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; +import org.vulpixel.config_extensions.gamerules.api.v1.gamerule.ViaConfigGameRule; +import org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; import java.util.function.Supplier; -import static lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod.GAME_RULE_REGISTRY; +import static org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod.GAME_RULE_REGISTRY; public class KaleidoConfigImpl { public static final KaleidoGameRuleConfig KALEIDO_GAME_RULE_CONFIG = KaleidoGameRuleConfig.createToml( GreenhouseConfigExtensionsGameRulesTestmod.getPlatformHelper().getConfigDir(), - "greenhouse_config_extensions_gamerules_testmod", + "config_extensions_gamerules_testmod", "kaleido_config", KaleidoGameRuleConfig.class ); diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java similarity index 73% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java index f90c906..8b4382d 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/kaleido/KaleidoGameRuleConfig.java @@ -6,19 +6,19 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.kaleido; +package org.vulpixel.config_extensions.gamerules.testmod.kaleido; import folk.sisby.kaleido.api.WrappedConfig; import folk.sisby.kaleido.lib.quiltconfig.api.annotations.Comment; public class KaleidoGameRuleConfig extends WrappedConfig { @Comment("An integer based gamerule.") - @Comment("Used for the value of 'greenhouse_config_extensions_gamerules_testmod:kaleido_int'") + @Comment("Used for the value of 'config_extensions_gamerules_testmod:kaleido_int'") @Comment("as a fallback if a per-world value is not set.") public int intGamerule = 0; @Comment("An boolean based gamerule.") - @Comment("Used for the value of 'greenhouse_config_extensions_gamerules_testmod:kaleido_boolean'") + @Comment("Used for the value of 'config_extensions_gamerules_testmod:kaleido_boolean'") @Comment("as a fallback if a per-world value is not set.") public boolean boolGamerule = false; } diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java similarity index 83% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java index a2c2e9c..a322932 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders.java @@ -6,9 +6,9 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.platform; +package org.vulpixel.config_extensions.gamerules.testmod.platform; -import lgbt.greenhouse.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; +import org.vulpixel.config_extensions.gamerules.impl.GreenhouseConfigExtensionsGameRules; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.Nullable; @@ -19,8 +19,8 @@ import java.lang.invoke.MethodType; /// We have {@link java.util.ServiceLoader}s at home. @ApiStatus.Internal public class GreenhouseConfigExtensionsGameRulesTestmodHelperLoaders { - private static final String FABRIC_CLASS = "lgbt.greenhouse.config_extensions.gamerules.fabric.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric"; - private static final String NEOFORGE_CLASS = "lgbt.greenhouse.config_extensions.gamerules.neoforge.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge"; + private static final String FABRIC_CLASS = "org.vulpixel.config_extensions.gamerules.fabric.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperFabric"; + private static final String NEOFORGE_CLASS = "org.vulpixel.config_extensions.gamerules.neoforge.testmod.platform.GreenhouseConfigExtensionsGameRulesTestmodPlatformHelperNeoForge"; @Nullable private static final MethodHandle FABRIC_PLATFORM_HELPER = find(lookup -> { diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java similarity index 85% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java index 5d44cb5..971bb67 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/GreenhouseConfigExtensionsGameRulesTestmodPlatformHelper.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.platform; +package org.vulpixel.config_extensions.gamerules.testmod.platform; import java.nio.file.Path; diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/Platform.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/Platform.java similarity index 83% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/Platform.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/Platform.java index 0b370dc..04db180 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/Platform.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/Platform.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.impl.platform; +package org.vulpixel.config_extensions.gamerules.testmod.platform; public enum Platform { FABRIC, diff --git a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/package-info.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/package-info.java similarity index 86% rename from gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/package-info.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/package-info.java index 719f77d..a55fdc8 100644 --- a/gamerules/xplat/src/main/java/lgbt/greenhouse/config_extensions/gamerules/impl/platform/package-info.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/platform/package-info.java @@ -8,7 +8,7 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.config_extensions.gamerules.impl.platform; +package org.vulpixel.config_extensions.gamerules.testmod.platform; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredRegistry.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredRegistry.java similarity index 90% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredRegistry.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredRegistry.java index da2f867..532011b 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredRegistry.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredRegistry.java @@ -6,10 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.registry; +package org.vulpixel.config_extensions.gamerules.testmod.registry; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; -import lgbt.greenhouse.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; +import org.vulpixel.config_extensions.gamerules.testmod.GreenhouseConfigExtensionsGameRulesTestmod; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceKey; diff --git a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredValue.java b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredValue.java similarity index 94% rename from gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredValue.java rename to gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredValue.java index 70ccddd..33a72b3 100644 --- a/gamerules/xplat/src/testmod/java/lgbt/greenhouse/config_extensions/gamerules/testmod/registry/DeferredValue.java +++ b/gamerules/xplat/src/testmod/java/org/vulpixel/config_extensions/gamerules/testmod/registry/DeferredValue.java @@ -6,7 +6,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -package lgbt.greenhouse.config_extensions.gamerules.testmod.registry; +package org.vulpixel.config_extensions.gamerules.testmod.registry; import net.minecraft.core.Holder; import net.minecraft.core.Registry; diff --git a/gamerules/xplat/src/testmod/resources/assets/greenhouse_config_extensions_gamerules_testmod/lang/en_us.json b/gamerules/xplat/src/testmod/resources/assets/greenhouse_config_extensions_gamerules_testmod/lang/en_us.json index 6653c68..4d11564 100644 --- a/gamerules/xplat/src/testmod/resources/assets/greenhouse_config_extensions_gamerules_testmod/lang/en_us.json +++ b/gamerules/xplat/src/testmod/resources/assets/greenhouse_config_extensions_gamerules_testmod/lang/en_us.json @@ -1,13 +1,11 @@ { - "gamerule.greenhouse_config_extensions_gamerules_testmod.greenhouse_config_boolean": "[GREENHOUSE CONFIG] Boolean", - "gamerule.greenhouse_config_extensions_gamerules_testmod.greenhouse_config_boolean.description": "A Greenhouse Config controlled boolean.", - "gamerule.greenhouse_config_extensions_gamerules_testmod.greenhouse_config_int": "[GREENHOUSE CONFIG] Int", - "gamerule.greenhouse_config_extensions_gamerules_testmod.greenhouse_config_int.description": "A Greenhouse Config controlled int.", + "gamerule.config_extensions_gamerules_testmod.greenhouse_config_boolean": "[GREENHOUSE CONFIG] Boolean", + "gamerule.config_extensions_gamerules_testmod.greenhouse_config_boolean.description": "A Greenhouse Config controlled boolean.", + "gamerule.config_extensions_gamerules_testmod.greenhouse_config_int": "[GREENHOUSE CONFIG] Int", + "gamerule.config_extensions_gamerules_testmod.greenhouse_config_int.description": "A Greenhouse Config controlled int.", - "gamerule.greenhouse_config_extensions_gamerules_testmod.kaleido_config_boolean": "[KALEIDO CONFIG] Boolean", - "gamerule.greenhouse_config_extensions_gamerules_testmod.kaleido_config_boolean.description": "A Kaleido Config controlled boolean.", - "gamerule.greenhouse_config_extensions_gamerules_testmod.kaleido_config_int": "[KALEIDO CONFIG] Int", - "gamerule.greenhouse_config_extensions_gamerules_testmod.kaleido_config_int.description": "A Kaleido Config controlled int.", - - "subtitles.greenhouse_config_testmod.sylv_fan": "Sylv's fan whirrs" + "gamerule.config_extensions_gamerules_testmod.kaleido_config_boolean": "[KALEIDO CONFIG] Boolean", + "gamerule.config_extensions_gamerules_testmod.kaleido_config_boolean.description": "A Kaleido Config controlled boolean.", + "gamerule.config_extensions_gamerules_testmod.kaleido_config_int": "[KALEIDO CONFIG] Int", + "gamerule.config_extensions_gamerules_testmod.kaleido_config_int.description": "A Kaleido Config controlled int." } -- 2.51.2