Skip to content

Commit

Permalink
1.19.1 update (#145)
Browse files Browse the repository at this point in the history
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
  • Loading branch information
RacoonDog and C10udburst authored Jul 31, 2022
1 parent 36bc339 commit 8d0ea98
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 142 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name: Java CI with Gradle

concurrency:
group: "build-1.19"
group: "build-1.19.1"
cancel-in-progress: true

on:
Expand Down Expand Up @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ classes/
*.launch

# idea

.idea/
*.iml
*.ipr
*.iws
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

65 changes: 0 additions & 65 deletions .idea/jarRepositories.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/misc.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations/Minecraft_Client.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
meteor_version=0.5.1
3 changes: 2 additions & 1 deletion src/main/java/anticope/rejects/commands/KickCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -35,7 +36,7 @@ public void build(LiteralArgumentBuilder<CommandSource> 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 -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]++;
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class MineProcessMixin {

@Shadow(remap = false)
private List<BlockPos> a; // knownOreLocations

@Inject(method = "a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V", at = @At("HEAD"), cancellable = true, remap = false)
private void onRescan(List<BlockPos> already, CalculationContext context, CallbackInfo ci) {
OreSim oreSim = Modules.get().get(OreSim.class);
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/anticope/rejects/modules/ChatBot.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 8d0ea98

Please sign in to comment.