diff --git a/build.gradle b/build.gradle index 3451d1dcdb..67bf32cb13 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ plugins { // Version List: https://projects.neoforged.net/neoforged/ModDevGradle id 'net.neoforged.moddev' version "${mdg_version}" id "com.dorongold.task-tree" version "4.0.0" + id 'io.github.0ffz.github-packages' version '[1,2)' } def secrets = new Properties() @@ -147,6 +148,7 @@ repositories { includeGroup "curse.maven" } } + maven githubPackage.invoke("The-Aether-Team/Cumulus") } dependencies { @@ -159,6 +161,7 @@ dependencies { // implementation "mezz.jei:jei-${project.base_minecraft_version}-neoforge:${project.jei_version}" // compileOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${project.rei_version}" // compileOnly "dev.emi:emi-neoforge:${project.emi_version}+${project.base_minecraft_version}" +// implementation "com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}" // theillusivec4 // implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.base_minecraft_version}" @@ -179,6 +182,8 @@ dependencies { testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.3' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.3' testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.12.0' + +// implementation fileTree(dir: 'libs', include: '*.jar') } configurations.testImplementation { diff --git a/gradle.properties b/gradle.properties index 3059c9de03..fbbc75bfc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,5 @@ jei_version=19.8.2.99 rei_version=16.0.744 emi_version=1.1.11 curios_version=9.0.5 -top_version=1.21_neo-12.0.3-5 \ No newline at end of file +top_version=1.21_neo-12.0.3-5 +cumulus_version=1.21.3-2.0.0-neoforge \ No newline at end of file diff --git a/src/generated/resources/.cache/d91874c9af25bf3e353141f6b1abac2184bcbcb7 b/src/generated/resources/.cache/d91874c9af25bf3e353141f6b1abac2184bcbcb7 index 57f11a13af..35c21c0e25 100644 --- a/src/generated/resources/.cache/d91874c9af25bf3e353141f6b1abac2184bcbcb7 +++ b/src/generated/resources/.cache/d91874c9af25bf3e353141f6b1abac2184bcbcb7 @@ -1,6 +1,6 @@ -// 1.21.1 2024-09-29T13:06:16.2225603 Languages: en_us for mod: twilightforest -3359d21ffe53e8483ca6b28f2ac99fa87e0a2a6a assets/twilightforest/lang/en_ud.json -25f41bf24d71fff78c740d89f8f199850f0e539d assets/twilightforest/lang/en_us.json +// 1.21.1 2024-11-30T21:22:12.5079017 Languages: en_us for mod: twilightforest +89d43d4e41a688eddf848dd6d840fc9e5efad177 assets/twilightforest/lang/en_ud.json +28a5be4f16c8a203d04179cc9317dddee7c95026 assets/twilightforest/lang/en_us.json bbbd252baa65057cac7aee7c411bd4a3ba6a8cc2 assets/twilightforest/tips/anvil_squashing.json 1847d9d9f397462f50271efcfc70684c2d413dca assets/twilightforest/tips/arctic_armor.json 36bde1f293696f4253bed0a224e7a1bb3abc3f9a assets/twilightforest/tips/banister_shape.json diff --git a/src/generated/resources/assets/twilightforest/lang/en_ud.json b/src/generated/resources/assets/twilightforest/lang/en_ud.json index 1a8078f5ac..0e370254ac 100644 --- a/src/generated/resources/assets/twilightforest/lang/en_ud.json +++ b/src/generated/resources/assets/twilightforest/lang/en_ud.json @@ -1726,6 +1726,7 @@ "twilightforest.configuration.section.twilightforest.common.toml": "sᵷuᴉʇʇǝS uoɯɯoƆ", "twilightforest.configuration.section.twilightforest.common.toml.title": "sᵷuᴉʇʇǝS uoɯɯoƆ", "twilightforest.configuration.title": "ᵷᴉɟuoƆ ʇsǝɹoℲ ʇɥᵷᴉꞁᴉʍ⟘", + "twilightforest.menu_title.twilight_forest": "ʇsǝɹoℲ ʇɥᵷᴉꞁᴉʍ⟘", "twilightforest.tips.anvil_squashing": "˙sꞁᴉʌuⱯ ʎq pǝɥsɐnbs ǝq uɐɔ sᵷnᗺ", "twilightforest.tips.arctic_armor": "˙ɹoꞁoɔ ʎuɐ pǝʎp ǝq uɐɔ ɹoɯɹⱯ ɔᴉʇɔɹⱯ", "twilightforest.tips.banister_shape": "˙ʇɥᵷᴉǝɥ ɹᴉǝɥʇ ǝᵷuɐɥɔ oʇ ǝxɐ uɐ ɥʇᴉʍ pǝʞɔᴉꞁɔ-ʇɥᵷᴉɹ ǝq uɐɔ sɹǝʇsᴉuɐᗺ", diff --git a/src/generated/resources/assets/twilightforest/lang/en_us.json b/src/generated/resources/assets/twilightforest/lang/en_us.json index 49f10c2056..b85194a4e6 100644 --- a/src/generated/resources/assets/twilightforest/lang/en_us.json +++ b/src/generated/resources/assets/twilightforest/lang/en_us.json @@ -1726,6 +1726,7 @@ "twilightforest.configuration.section.twilightforest.common.toml": "Common Settings", "twilightforest.configuration.section.twilightforest.common.toml.title": "Common Settings", "twilightforest.configuration.title": "Twilight Forest Config", + "twilightforest.menu_title.twilight_forest": "Twilight Forest", "twilightforest.tips.anvil_squashing": "Bugs can be squashed by Anvils.", "twilightforest.tips.arctic_armor": "Arctic Armor can be dyed any color.", "twilightforest.tips.banister_shape": "Banisters can be right-clicked with an axe to change their height.", diff --git a/src/main/java/twilightforest/client/TwilightForestTitleScreen.java b/src/main/java/twilightforest/client/TwilightForestTitleScreen.java new file mode 100644 index 0000000000..00940541d4 --- /dev/null +++ b/src/main/java/twilightforest/client/TwilightForestTitleScreen.java @@ -0,0 +1,9 @@ +package twilightforest.client; + +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.sounds.Music; +import twilightforest.init.TFSounds; + +public class TwilightForestTitleScreen extends TitleScreen { + public static final Music MENU = new Music(TFSounds.MUSIC_DISC_HOME, 20, 600, true); +} diff --git a/src/main/java/twilightforest/compat/CumulusCompat.java b/src/main/java/twilightforest/compat/CumulusCompat.java new file mode 100644 index 0000000000..8a0ea545d5 --- /dev/null +++ b/src/main/java/twilightforest/compat/CumulusCompat.java @@ -0,0 +1,30 @@ +package twilightforest.compat; + +import com.aetherteam.cumulus.api.CumulusEntrypoint; +import com.aetherteam.cumulus.api.Menu; +import com.aetherteam.cumulus.api.MenuInitializer; +import com.aetherteam.cumulus.api.MenuRegisterCallback; +import net.minecraft.client.renderer.CubeMap; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import twilightforest.TwilightForestMod; +import twilightforest.client.TwilightForestTitleScreen; + +@CumulusEntrypoint +public class CumulusCompat implements MenuInitializer { + private static final ResourceLocation TWILIGHT_FOREST_ICON = ResourceLocation.fromNamespaceAndPath(TwilightForestMod.ID, "textures/gui/menu_api/menu_icon_twilight_forest.png"); + private static final Component TWILIGHT_FOREST_NAME = Component.translatable("twilightforest.menu_title.twilight_forest"); + public static final Menu TWILIGHT_FOREST = new Menu( + TWILIGHT_FOREST_ICON, + TWILIGHT_FOREST_NAME, + new TwilightForestTitleScreen(), + new Menu.Properties() + .music(TwilightForestTitleScreen.MENU) + .panorama(new CubeMap(ResourceLocation.fromNamespaceAndPath(TwilightForestMod.ID, "textures/gui/title/panorama/panorama"))) + ); + + @Override + public void registerMenus(MenuRegisterCallback menuRegisterCallback) { + menuRegisterCallback.registerMenu(ResourceLocation.fromNamespaceAndPath(TwilightForestMod.ID, "twilight_forest"), TWILIGHT_FOREST); + } +} diff --git a/src/main/java/twilightforest/data/LangGenerator.java b/src/main/java/twilightforest/data/LangGenerator.java index dd38f88c48..6c5f0b08cf 100644 --- a/src/main/java/twilightforest/data/LangGenerator.java +++ b/src/main/java/twilightforest/data/LangGenerator.java @@ -1089,5 +1089,8 @@ protected void addTranslations() { this.add("config.twilightforest.multiplayer_fight_adjuster.more_loot", "More Loot"); this.add("config.twilightforest.multiplayer_fight_adjuster.more_health", "More Health"); this.add("config.twilightforest.multiplayer_fight_adjuster.more_loot_and_health", "More Loot & Health"); + + + this.add("twilightforest.menu_title.twilight_forest", "Twilight Forest"); } } diff --git a/src/main/resources/assets/twilightforest/textures/gui/menu_api/menu_icon_twilight_forest.png b/src/main/resources/assets/twilightforest/textures/gui/menu_api/menu_icon_twilight_forest.png new file mode 100644 index 0000000000..3e8bb6409c Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/menu_api/menu_icon_twilight_forest.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_0.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_0.png new file mode 100644 index 0000000000..7c2d47563e Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_0.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_1.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_1.png new file mode 100644 index 0000000000..d15298f74c Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_1.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_2.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_2.png new file mode 100644 index 0000000000..76d3c15326 Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_2.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_3.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_3.png new file mode 100644 index 0000000000..ebce476f13 Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_3.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_4.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_4.png new file mode 100644 index 0000000000..ca77467a05 Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_4.png differ diff --git a/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_5.png b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_5.png new file mode 100644 index 0000000000..ce18f5132a Binary files /dev/null and b/src/main/resources/assets/twilightforest/textures/gui/title/panorama/panorama_5.png differ