diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 8cee370f..16776883 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -4,7 +4,7 @@
name: Java CI with Gradle
concurrency:
- group: "build-1.19"
+ group: "build-1.19.1"
cancel-in-progress: true
on:
@@ -34,9 +34,9 @@ jobs:
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
- automatic_release_tag: "latest-1.19"
+ automatic_release_tag: "latest-1.19.1"
prerelease: false
- title: "1.19 Build"
+ title: "1.19.1 Build"
files: |
./build/libs/*.jar
diff --git a/.gitignore b/.gitignore
index b47e8087..09cd281f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ classes/
*.launch
# idea
+
+.idea/
*.iml
*.ipr
*.iws
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521..00000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index b589d56e..00000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 592fdc77..00000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index a2c3b2be..00000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5cbe6eaf..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea5..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations/Minecraft_Client.xml b/.idea/runConfigurations/Minecraft_Client.xml
deleted file mode 100644
index 440487ef..00000000
--- a/.idea/runConfigurations/Minecraft_Client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7accb9d8..f1f358f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,7 +80,7 @@ tasks.withType(JavaCompile).configureEach {
// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
// We'll use that if it's available, but otherwise we'll use the older option.
- def targetVersion = 16
+ def targetVersion = 17
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion
}
diff --git a/gradle.properties b/gradle.properties
index c8275b9b..fad030f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G
# Fabric Properties
-minecraft_version=1.19
-yarn_version=1.19+build.1
-loader_version=0.14.7
+minecraft_version=1.19.1
+yarn_version=1.19.1+build.4
+loader_version=0.14.8
# Mod Properties
mod_version = 0.2
maven_group = anticope.rejects
archives_base_name = meteor-rejects-addon
-meteor_version=0.5.0
\ No newline at end of file
+meteor_version=0.5.1
\ No newline at end of file
diff --git a/src/main/java/anticope/rejects/commands/KickCommand.java b/src/main/java/anticope/rejects/commands/KickCommand.java
index cc723aca..2a1f7a18 100644
--- a/src/main/java/anticope/rejects/commands/KickCommand.java
+++ b/src/main/java/anticope/rejects/commands/KickCommand.java
@@ -2,6 +2,7 @@
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import meteordevelopment.meteorclient.utils.player.ChatUtils;
import net.minecraft.client.util.GlfwUtil;
import net.minecraft.command.CommandSource;
import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
@@ -35,7 +36,7 @@ public void build(LiteralArgumentBuilder builder) {
return SINGLE_SUCCESS;
}));
builder.then(literal("chat").executes(ctx -> {
- mc.player.sendChatMessage("§0§1§");
+ ChatUtils.sendPlayerMsg("§0§1§");
return SINGLE_SUCCESS;
}));
builder.then(literal("shutdown").executes(ctx -> {
diff --git a/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java b/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
index 388e91aa..1dfa6c14 100644
--- a/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
+++ b/src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
@@ -187,7 +187,7 @@ private ItemStack[] getInventory(Entity e) {
index[0]++;
}
}
- e.getItemsHand().forEach(itemStack -> {
+ e.getHandItems().forEach(itemStack -> {
if (itemStack != null) {
stack[index[0]] = itemStack;
index[0]++;
diff --git a/src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java b/src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java
index d2293759..84e2b146 100644
--- a/src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java
+++ b/src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java
@@ -1,14 +1,14 @@
package anticope.rejects.mixin;
import anticope.rejects.modules.modifier.NoRenderModifier;
-import net.minecraft.client.gui.screen.CommandSuggestor;
+import net.minecraft.client.gui.screen.ChatInputSuggestor;
import net.minecraft.client.util.math.MatrixStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-@Mixin(CommandSuggestor.class)
+@Mixin(ChatInputSuggestor.class)
public class CommandSuggestorMixin {
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
public void onRenderCommandSuggestion(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) {
diff --git a/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java b/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java
index d2338568..02434055 100644
--- a/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java
+++ b/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java
@@ -23,7 +23,6 @@ public class MineProcessMixin {
@Shadow(remap = false)
private List a; // knownOreLocations
-
@Inject(method = "a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V", at = @At("HEAD"), cancellable = true, remap = false)
private void onRescan(List already, CalculationContext context, CallbackInfo ci) {
OreSim oreSim = Modules.get().get(OreSim.class);
diff --git a/src/main/java/anticope/rejects/modules/ChatBot.java b/src/main/java/anticope/rejects/modules/ChatBot.java
index 0122ebc3..64a2ea5a 100644
--- a/src/main/java/anticope/rejects/modules/ChatBot.java
+++ b/src/main/java/anticope/rejects/modules/ChatBot.java
@@ -4,6 +4,7 @@
import anticope.rejects.MeteorRejectsAddon;
import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer;
+import meteordevelopment.meteorclient.utils.player.ChatUtils;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtString;
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
@@ -70,13 +71,13 @@ private void onMessageRecieve(ReceiveMessageEvent event) {
for (String cmd : commands.keySet()) {
if (msg.endsWith(prefix.get()+cmd)) {
Script script = compile(commands.get(cmd));
- if (script == null) mc.player.sendChatMessage("An error occurred");
+ if (script == null) ChatUtils.sendPlayerMsg("An error occurred");
try {
var section = MeteorStarscript.ss.run(script);
- mc.player.sendChatMessage(section.text);
+ ChatUtils.sendPlayerMsg(section.text);
} catch (StarscriptError e) {
MeteorStarscript.printChatError(e);
- mc.player.sendChatMessage("An error occurred");
+ ChatUtils.sendPlayerMsg("An error occurred");
}
return;
}