diff --git a/build.gradle b/build.gradle index 7a07657..ae2a734 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'eclipse' id 'maven-publish' id 'net.minecraftforge.gradle' version '5.1.+' + id 'org.parchmentmc.librarian.forgegradle' version '1.+' } version = "${mc_version}-${myversion}" @@ -26,7 +27,8 @@ 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: "${mc_version}" + // mappings channel: 'official', version: "${mc_version}" + mappings channel: 'parchment', version: "${parchment_version}-${mc_version}" // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. @@ -159,7 +161,7 @@ jar { "Specification-Version" : "${myversion}", // We are version 1 of ourselves "Implementation-Title" : project.name, "Implementation-Version" : "${myversion}", - "Implementation-Vendor" : "ZNI Creations", + "Implementation-Vendor" : "Aria's Creations", "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } diff --git a/gradle.properties b/gradle.properties index 655251c..3d41277 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,9 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mc_version=1.19.4 -forge_version=45.0.46 -myversion=1.1.4.0422230346 -libz_version=1.0.7.0422230320 +mc_version=1.19.3 +forge_version=44.1.0 +myversion=1.1.4.0515232205 +libz_version=1.0.7.0515232132 + +parchment_version=2023.03.12 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index fb61b26..c1a3a81 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,5 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() maven { url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://maven.parchmentmc.org' } // Add this line } } \ No newline at end of file diff --git a/src/main/java/dev/zontreck/mcmods/CheckInventory.java b/src/main/java/dev/zontreck/mcmods/CheckInventory.java index 5182ddf..d011393 100644 --- a/src/main/java/dev/zontreck/mcmods/CheckInventory.java +++ b/src/main/java/dev/zontreck/mcmods/CheckInventory.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import java.util.TimerTask; +import dev.zontreck.ariaslib.terminal.Task; import dev.zontreck.ariaslib.util.DelayedExecutorService; import dev.zontreck.libzontreck.chat.ChatColor; import dev.zontreck.libzontreck.chat.ChatColorFactory; @@ -22,9 +23,13 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; -public class CheckInventory implements Runnable { +public class CheckInventory extends Task { private static final CheckInventory inst = new CheckInventory(); + public CheckInventory() { + super("checkinv", true); + } + public static CheckInventory getInstance(){ return inst; } diff --git a/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java b/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java index 0e21452..8f73259 100644 --- a/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java +++ b/src/main/java/dev/zontreck/mcmods/WatchMyDurability.java @@ -86,9 +86,8 @@ public class WatchMyDurability //LOGGER.info("HELLO FROM CLIENT SETUP"); //LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); WatchMyDurability.CurrentUser = Minecraft.getInstance().getUser(); + DelayedExecutorService.setup(); - DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(), - WMDClientConfig.TimerVal.get()); //time.schedule(new CheckInventory(), //WMDClientConfig.TimerVal.get()*1000, @@ -109,6 +108,7 @@ public class WatchMyDurability //LOGGER.info("PLAYER LOGGED IN"); LOGGER.info(WMDPrefix+": : : PLAYER LOGGED IN : : :"); WatchMyDurability.isInGame=true; + DelayedExecutorService.start(); DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(), WMDClientConfig.TimerVal.get()); } @@ -118,6 +118,7 @@ public class WatchMyDurability //LOGGER.info("PLAYER LOGGED OUT"); LOGGER.info(WMDPrefix+": : : PLAYER LOGGED OUT : : :"); WatchMyDurability.isInGame=false; + DelayedExecutorService.stop(); } @SubscribeEvent diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 7289f15..8618688 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,7 +6,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="[45,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion="[44,)" #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-v3" @@ -55,7 +55,7 @@ Edit the config file to customize the alerts # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[45,)" #mandatory + versionRange="[44,)" #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 @@ -65,7 +65,7 @@ Edit the config file to customize the alerts 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.4,1.20)" + versionRange="[1.19.3,1.20)" ordering="NONE" side="CLIENT" [[dependencies.watchmydurability]]