Update to 1.19.3, update DelayedExecutorService references.
This commit is contained in:
parent
8289bdecaf
commit
b45e9c3fec
6 changed files with 23 additions and 12 deletions
|
@ -2,6 +2,7 @@ plugins {
|
||||||
id 'eclipse'
|
id 'eclipse'
|
||||||
id 'maven-publish'
|
id 'maven-publish'
|
||||||
id 'net.minecraftforge.gradle' version '5.1.+'
|
id 'net.minecraftforge.gradle' version '5.1.+'
|
||||||
|
id 'org.parchmentmc.librarian.forgegradle' version '1.+'
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "${mc_version}-${myversion}"
|
version = "${mc_version}-${myversion}"
|
||||||
|
@ -26,7 +27,8 @@ minecraft {
|
||||||
//
|
//
|
||||||
// Use non-default mappings at your own risk. They may not always work.
|
// 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.
|
// 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.
|
// 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
|
"Specification-Version" : "${myversion}", // We are version 1 of ourselves
|
||||||
"Implementation-Title" : project.name,
|
"Implementation-Title" : project.name,
|
||||||
"Implementation-Version" : "${myversion}",
|
"Implementation-Version" : "${myversion}",
|
||||||
"Implementation-Vendor" : "ZNI Creations",
|
"Implementation-Vendor" : "Aria's Creations",
|
||||||
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,9 @@
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
mc_version=1.19.4
|
mc_version=1.19.3
|
||||||
forge_version=45.0.46
|
forge_version=44.1.0
|
||||||
myversion=1.1.4.0422230346
|
myversion=1.1.4.0515232205
|
||||||
libz_version=1.0.7.0422230320
|
libz_version=1.0.7.0515232132
|
||||||
|
|
||||||
|
parchment_version=2023.03.12
|
|
@ -2,5 +2,6 @@ pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
maven { url = 'https://maven.minecraftforge.net/' }
|
maven { url = 'https://maven.minecraftforge.net/' }
|
||||||
|
maven { url = 'https://maven.parchmentmc.org' } // Add this line
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.TimerTask;
|
import java.util.TimerTask;
|
||||||
|
|
||||||
|
import dev.zontreck.ariaslib.terminal.Task;
|
||||||
import dev.zontreck.ariaslib.util.DelayedExecutorService;
|
import dev.zontreck.ariaslib.util.DelayedExecutorService;
|
||||||
import dev.zontreck.libzontreck.chat.ChatColor;
|
import dev.zontreck.libzontreck.chat.ChatColor;
|
||||||
import dev.zontreck.libzontreck.chat.ChatColorFactory;
|
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.entity.player.Inventory;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
|
||||||
public class CheckInventory implements Runnable {
|
public class CheckInventory extends Task {
|
||||||
private static final CheckInventory inst = new CheckInventory();
|
private static final CheckInventory inst = new CheckInventory();
|
||||||
|
|
||||||
|
public CheckInventory() {
|
||||||
|
super("checkinv", true);
|
||||||
|
}
|
||||||
|
|
||||||
public static CheckInventory getInstance(){
|
public static CheckInventory getInstance(){
|
||||||
return inst;
|
return inst;
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,9 +86,8 @@ public class WatchMyDurability
|
||||||
//LOGGER.info("HELLO FROM CLIENT SETUP");
|
//LOGGER.info("HELLO FROM CLIENT SETUP");
|
||||||
//LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
|
//LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
|
||||||
WatchMyDurability.CurrentUser = Minecraft.getInstance().getUser();
|
WatchMyDurability.CurrentUser = Minecraft.getInstance().getUser();
|
||||||
|
DelayedExecutorService.setup();
|
||||||
|
|
||||||
DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(),
|
|
||||||
WMDClientConfig.TimerVal.get());
|
|
||||||
|
|
||||||
//time.schedule(new CheckInventory(),
|
//time.schedule(new CheckInventory(),
|
||||||
//WMDClientConfig.TimerVal.get()*1000,
|
//WMDClientConfig.TimerVal.get()*1000,
|
||||||
|
@ -109,6 +108,7 @@ public class WatchMyDurability
|
||||||
//LOGGER.info("PLAYER LOGGED IN");
|
//LOGGER.info("PLAYER LOGGED IN");
|
||||||
LOGGER.info(WMDPrefix+": : : PLAYER LOGGED IN : : :");
|
LOGGER.info(WMDPrefix+": : : PLAYER LOGGED IN : : :");
|
||||||
WatchMyDurability.isInGame=true;
|
WatchMyDurability.isInGame=true;
|
||||||
|
DelayedExecutorService.start();
|
||||||
|
|
||||||
DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(), WMDClientConfig.TimerVal.get());
|
DelayedExecutorService.getInstance().schedule(CheckInventory.getInstance(), WMDClientConfig.TimerVal.get());
|
||||||
}
|
}
|
||||||
|
@ -118,6 +118,7 @@ public class WatchMyDurability
|
||||||
//LOGGER.info("PLAYER LOGGED OUT");
|
//LOGGER.info("PLAYER LOGGED OUT");
|
||||||
LOGGER.info(WMDPrefix+": : : PLAYER LOGGED OUT : : :");
|
LOGGER.info(WMDPrefix+": : : PLAYER LOGGED OUT : : :");
|
||||||
WatchMyDurability.isInGame=false;
|
WatchMyDurability.isInGame=false;
|
||||||
|
DelayedExecutorService.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||||
modLoader="javafml" #mandatory
|
modLoader="javafml" #mandatory
|
||||||
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
|
# 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.
|
# 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.
|
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||||
license="GPL-v3"
|
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
|
# Does this dependency have to exist - if not, ordering below must be specified
|
||||||
mandatory=true #mandatory
|
mandatory=true #mandatory
|
||||||
# The version range of the dependency
|
# 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
|
# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
|
||||||
ordering="NONE"
|
ordering="NONE"
|
||||||
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
# Side this dependency is applied on - BOTH, CLIENT or SERVER
|
||||||
|
@ -65,7 +65,7 @@ Edit the config file to customize the alerts
|
||||||
modId="minecraft"
|
modId="minecraft"
|
||||||
mandatory=true
|
mandatory=true
|
||||||
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
# 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"
|
ordering="NONE"
|
||||||
side="CLIENT"
|
side="CLIENT"
|
||||||
[[dependencies.watchmydurability]]
|
[[dependencies.watchmydurability]]
|
||||||
|
|
Reference in a new issue