Merge pull request #50 from MIA-Development-Team/deps/updatedeps

deps: update gradle

Author: lonelyicer

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.moddev' version '2.0.78'
+    id 'net.neoforged.moddev' version '2.0.115'
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -30,21 +30,18 @@ repositories {
         name = "Jared's maven"
         url = "https://maven.blamejared.com/"
     }
-
     // Curios
     maven {
         name = "Curios"
         url = uri("https://maven.theillusivec4.top/")
     }
     // Patchouli
     maven { url 'https://maven.blamejared.com' }
-
     // Simple Bedrock Model
     maven {
         url = "https://api.modrinth.com/maven"
         content { includeGroup "maven.modrinth" }
     }
-
     // KubeJS
     maven {
         url "https://maven.latvian.dev/releases"
@@ -80,12 +77,14 @@ dependencies {
 
     // Jade
     implementation "maven.modrinth:jade:${project.jade_version}"
+
     // Simple Bedrock Model
-    implementation jarJar("maven.modrinth:simplebedrockmodel:1.4.0-neoforge+mc1.21.1")
+    implementation jarJar("maven.modrinth:simplebedrockmodel:$sbm_version")
+    compileOnly("com.maydaymemory:mae:$mae_version")
 
     // KubeJS
     api("dev.latvian.mods:kubejs-neoforge:$kubejs_version")
-    interfaceInjectionData("dev.latvian.mods:kubejs-neoforge:$kubejs_version") // optional
+    interfaceInjectionData("dev.latvian.mods:kubejs-neoforge:$kubejs_version")
 }
 
 base {
@@ -96,24 +95,16 @@ base {
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 neoForge {
-    // Specify the version of NeoForge to use.
     version = project.neo_version
 
     parchment {
         mappingsVersion = project.parchment_mappings_version
         minecraftVersion = project.parchment_minecraft_version
     }
 
-    // This line is optional. Access Transformers are automatically detected
-    accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
     runs {
         client {
             client()
-
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
@@ -123,45 +114,22 @@ neoForge {
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
         gameTestServer {
             type = "gameTestServer"
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
         data {
             data()
-
-            // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
-            // gameDirectory = project.file('run-data')
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
         }
-
-        // applies to all the run configs above
         configureEach {
-            // Recommended logging data for a userdev environment
-            // The markers can be added/remove as needed separated by commas.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             systemProperty 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             logLevel = org.slf4j.event.Level.DEBUG
         }
     }
 
     mods {
-        // define mod <-> source bindings
-        // these are used to tell the game which sources are for which mod
-        // mostly optional in a single mod project
-        // but multi mod projects should define one per mod
         "${mod_id}" {
             sourceSet(sourceSets.main)
         }
@@ -195,7 +163,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
             mod_authors            : mod_authors,
             mod_description        : mod_description,
             curios_version_range   : curios_version_range,
-            geckolib_version_range : geckolib_version_range
     ]
     inputs.properties replaceProperties
     expand replaceProperties

gradle.properties

@@ -20,8 +20,8 @@ emi_version=1.1.22+1.21.1
 jade_version=15.10.1+neoforge
 patchouli_version=1.21-88-NEOFORGE
 kubejs_version=2101.7.1-build.181
-geckolib_version=4.7.6
-geckolib_version_range=[4.7.0,)
+sbm_version=1.4.0-neoforge+mc1.21.1
+mae_version=1.0.2
 
 mod_id=mia
 mod_name=Made In Abyss

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -7,5 +7,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }

src/main/java/com/altnoir/mia/block/entity/EndlessCupBlockEntity.java

@@ -18,7 +18,7 @@
 import org.jetbrains.annotations.Nullable;
 
 public class EndlessCupBlockEntity extends BlockEntity {
-    public FluidTank fluidTank = new FluidTank(100000) {
+    public FluidTank fluidTank = new FluidTank(Integer.MAX_VALUE) {
         @Override
         protected void onContentsChanged() {
             setChanged();
@@ -56,6 +56,6 @@ public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
     }
 
     public static void tick(Level level, BlockPos pos, BlockState state, EndlessCupBlockEntity blockEntity) {
-        blockEntity.fluidTank.fill(new FluidStack(Fluids.WATER, 100000), IFluidHandler.FluidAction.EXECUTE);
+        blockEntity.fluidTank.fill(new FluidStack(Fluids.WATER, Integer.MAX_VALUE), IFluidHandler.FluidAction.EXECUTE);
     }
 }

src/main/templates/META-INF/neoforge.mods.toml

@@ -92,14 +92,6 @@ config="${mod_id}.mixins.json"
     ordering="NONE"
     side="BOTH"
 
-#[[dependencies.${mod_id}]]
-#    modId="geckolib"
-#    type="required"
-#    versionRange="${geckolib_version_range}"
-#    ordering="NONE"
-#    side="CLIENT"
-
-
 # Features are specific properties of the game environment, that you may want to declare you require. This example declares
 # that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
 # stop your mod loading on the server for example.