From 2b2ccbdc9850b8315a21df0a5b00b89e0ce78070 Mon Sep 17 00:00:00 2001 From: Javier Darkona Date: Thu, 23 May 2024 11:34:55 -0400 Subject: [PATCH] Updated to 1.20.1 --- build.gradle | 12 ++++++------ .../structuredmodloader/StructuredModLoader.java | 7 ++----- src/main/resources/META-INF/mods.toml | 10 +++++----- src/main/resources/pack.mcmeta | 2 +- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 98618bd..18a3177 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { id 'eclipse' id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.1.+' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' } -version = '1.19-1.0.0' +version = '1.20.1-1.0.0' group = 'com.chaos02.structuredmodloader' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'StructuredModLoader' @@ -26,7 +26,7 @@ minecraft { // // Use non-default mappings at your own risk. They may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.19' + mappings channel: 'official', version: '1.20.1' // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. @@ -129,7 +129,7 @@ dependencies { // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.19-41.0.100' + minecraft 'net.minecraftforge:forge:1.20.1-47.0.35' // Real mod deobf dependency examples - these get remapped to your current mappings // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency @@ -149,11 +149,11 @@ jar { manifest { attributes([ "Specification-Title" : "StructuredModLoader", - "Specification-Vendor" : "Chaos_02", + "Specification-Vendor" : "Chaos_02,Darkona", "Specification-Version" : "1", // We are version 1 of ourselves "Implementation-Title" : project.name, "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "Chaos_02", + "Implementation-Vendor" : "Chaos_02,Darkona", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } diff --git a/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java b/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java index 4deb964..e4414ab 100644 --- a/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java +++ b/src/main/java/com/chaos02/structuredmodloader/StructuredModLoader.java @@ -61,8 +61,7 @@ public StructuredModLoader() { public void setup(final FMLCommonSetupEvent event) { // some preinit code LOGGER.info(LogMarkers.LOADING, "Hello world from [SML]!!!"); - LOGGER.info(LogMarkers.SPLASH, - "A HUGE THANK YOU! to stiebi99#2124 again because literally without him this mod would never exist!"); + LOGGER.info(LogMarkers.SPLASH,"..."); } public class KeywordValidator { @@ -72,9 +71,7 @@ public boolean test(String toValidate) { } } - private static final Predicate KeywordValidator = s -> { - return (s instanceof String); - }; + private static final Predicate KeywordValidator = s -> (s instanceof String); public void configProvider() { LOGGER.info("Loading Config now! ({})", CONFIGFILE.toString()); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 33e3506..d4778c5 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion="[41,42)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[47)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license="GPL-3.0" @@ -24,9 +24,9 @@ displayURL="https://github.com/Chaos02/SubFolderLoader" #optional # A file name (in the root of the mod JAR) containing a logo for display logoFile="StructuredModLoader.png" #optional # A text field displayed in the mod UI -credits="stiebi99#2124 on Discord without whom it would not have been possible to create this mod!" #optional +credits="" #optional # A text field displayed in the mod UI -authors="Chaos_02" #optional +authors="Chaos02,Darkona" #optional # Display Test controls the display for your mod in the server connection screen # MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. # IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. @@ -47,7 +47,7 @@ to provide cleaner modpack structure # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[41,42)" #mandatory + versionRange="[47)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -57,6 +57,6 @@ to provide cleaner modpack structure modId="minecraft" mandatory=true # This version range declares a minimum of the current minecraft version up to but not including the next major version - versionRange="[1.19,1.20)" + versionRange="[1.20.1]" ordering="NONE" side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 29b5098..6a1d359 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "StructuredModLoader", - "pack_format": 8 + "pack_format": 15 } }