From 4205c1ae421fa8508980185dcf186a391e5c7c2d Mon Sep 17 00:00:00 2001 From: bconlon Date: Sat, 20 Jan 2024 00:49:24 -0800 Subject: [PATCH] feat: 1.20.4 initial commit --- build.gradle | 4 ++-- gradle.properties | 6 +++--- .../0f202e000d40347127b33b6edbbb29689b8cbf86 | 4 ++-- ...> 222c7a37905a9e3eae8a1bd77013bedc2d6bd57a} | 2 +- src/generated/resources/pack.mcmeta | 2 +- .../java/com/aetherteam/cumulus/Cumulus.java | 18 +++++++----------- .../gui/component/MenuSelectionList.java | 8 ++++---- .../client/gui/screen/MenuSelectionScreen.java | 4 ++-- src/main/resources/META-INF/mods.toml | 10 +++++----- 9 files changed, 27 insertions(+), 31 deletions(-) rename src/generated/resources/.cache/{c622617f6fabf890a00b9275cd5f643584a8a2c8 => 222c7a37905a9e3eae8a1bd77013bedc2d6bd57a} (50%) diff --git a/build.gradle b/build.gradle index 254dc6f..1ba2f09 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ runs { } data { - programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/').getAbsolutePath() + programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath(), '--existing', file('src/generated/resources/').getAbsolutePath() } } @@ -49,7 +49,7 @@ sourceSets.main.resources { subsystems { parchment { - minecraftVersion = project.mc_version + minecraftVersion = '1.20.3' //todo mappingsVersion = project.mappings } } diff --git a/gradle.properties b/gradle.properties index bd80e8d..6be93b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ org.gradle.daemon=false mod_id=cumulus_menus mod_name=Cumulus mod_version=1.0.0 -mc_version=1.20.2 -neoforge_version=20.2.88 -mappings=2023.12.10 +mc_version=1.20.4 +neoforge_version=20.4.118-beta +mappings=2023.12.31 # Dependencies diff --git a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 index 7f9fc60..547da42 100644 --- a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 +++ b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 @@ -1,2 +1,2 @@ -// 1.20.1 2023-08-22T18:52:58.2097967 Pack Metadata -dd3c60fd02429ac402f8102d597a833e5a37450f pack.mcmeta +// 1.20.4 2024-01-20T00:47:05.7179247 Pack Metadata +d80ebb5841143cd1b3ac9926dc3100ca5b1a7759 pack.mcmeta diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/222c7a37905a9e3eae8a1bd77013bedc2d6bd57a similarity index 50% rename from src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 rename to src/generated/resources/.cache/222c7a37905a9e3eae8a1bd77013bedc2d6bd57a index 8c472d7..60f1996 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/222c7a37905a9e3eae8a1bd77013bedc2d6bd57a @@ -1,2 +1,2 @@ -// 1.20.1 2023-08-22T18:52:58.1947962 Languages: en_us +// 1.20.4 2024-01-20T00:47:05.7039284 Languages: en_us for mod: cumulus_menus 0cb2af7dbbd8bd2ff78b335c92a753a3048b1730 assets/cumulus_menus/lang/en_us.json diff --git a/src/generated/resources/pack.mcmeta b/src/generated/resources/pack.mcmeta index 3143bae..1f664ae 100644 --- a/src/generated/resources/pack.mcmeta +++ b/src/generated/resources/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "translate": "pack.cumulus_menus.mod.description" }, - "pack_format": 15 + "pack_format": 22 } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/cumulus/Cumulus.java b/src/main/java/com/aetherteam/cumulus/Cumulus.java index 0bca995..1aa44df 100644 --- a/src/main/java/com/aetherteam/cumulus/Cumulus.java +++ b/src/main/java/com/aetherteam/cumulus/Cumulus.java @@ -19,15 +19,13 @@ import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.common.Mod; import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; -import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.neoforge.data.event.GatherDataEvent; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.NewRegistryEvent; import net.neoforged.neoforge.registries.RegistryBuilder; import org.slf4j.Logger; -import java.util.Map; +import java.util.Optional; @Mod(Cumulus.MODID) public class Cumulus { @@ -37,19 +35,18 @@ public class Cumulus { public static final ResourceKey> MENU_REGISTRY_KEY = ResourceKey.createRegistryKey(new ResourceLocation(Cumulus.MODID, "menu")); public static final Registry MENU_REGISTRY = new RegistryBuilder<>(MENU_REGISTRY_KEY).sync(true).create(); - public Cumulus() { - if (FMLEnvironment.dist == Dist.CLIENT) { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - modEventBus.addListener(NewRegistryEvent.class, event -> event.register(MENU_REGISTRY)); + public Cumulus(IEventBus bus, Dist dist) { + if (dist == Dist.CLIENT) { + bus.addListener(NewRegistryEvent.class, event -> event.register(MENU_REGISTRY)); - modEventBus.addListener(this::dataSetup); + bus.addListener(this::dataSetup); DeferredRegister[] registers = { Menus.MENUS, }; for (DeferredRegister register : registers) { - register.register(modEventBus); + register.register(bus); } ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, CumulusConfig.CLIENT_SPEC); @@ -65,8 +62,7 @@ public void dataSetup(GatherDataEvent event) { // pack.mcmeta PackMetadataGenerator packMeta = new PackMetadataGenerator(packOutput); - Map packTypes = Map.of(PackType.SERVER_DATA, SharedConstants.getCurrentVersion().getPackVersion(PackType.SERVER_DATA)); - packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.cumulus_menus.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), packTypes)); + packMeta.add(PackMetadataSection.TYPE, new PackMetadataSection(Component.translatable("pack.cumulus_menus.mod.description"), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES), Optional.empty())); generator.addProvider(true, packMeta); } } diff --git a/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java b/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java index 08c8783..05d236f 100644 --- a/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java +++ b/src/main/java/com/aetherteam/cumulus/client/gui/component/MenuSelectionList.java @@ -17,16 +17,16 @@ public class MenuSelectionList extends ObjectSelectionList { diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index da3c462..35fe6a5 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -7,7 +7,7 @@ issueTrackerURL="https://github.com/The-Aether-Team/Cumulus/issues" modId="cumulus_menus" version="${file.jarVersion}" displayName="Cumulus" -updateJSONURL="https://github.com/The-Aether-Team/Cumulus/raw/1.20.2-develop/update.json" +updateJSONURL="https://github.com/The-Aether-Team/Cumulus/raw/1.20.4-develop/update.json" displayURL="https://modrinth.com/mod/cumulus" logoFile="cumulus.png" credits="The Aether Team; kingbdogz, for the original Main Menu API that this is inspired by" @@ -17,14 +17,14 @@ description=''' [[dependencies.cumulus_menus]] modId="neoforge" - mandatory=true - versionRange="[20.2.0,)" + type="required" + versionRange="[20.4.0,)" ordering="NONE" side="BOTH" [[dependencies.cumulus_menus]] modId="minecraft" - mandatory=true - versionRange="[1.20.2,1.20.3)" + type="required" + versionRange="[1.20.4,1.20.5)" ordering="NONE" side="BOTH"