morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

1.19.1 update (#145)

Browse Source 
Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
This commit is contained in:
RacoonDog
2022-07-31 04:27:25 -04:00
committed by GitHub
parent 36bc339e74
commit 8d0ea9869e
17 changed files with 19 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/gradle.yml vendored
View File

@@ -4,7 +4,7 @@
name: Java CI with Gradle name: Java CI with Gradle
concurrency: concurrency:
group: "build-1.19" group: "build-1.19.1"
cancel-in-progress: true cancel-in-progress: true
on: on:
@@ -34,9 +34,9 @@ jobs:
- uses: "marvinpinto/action-automatic-releases@latest" - uses: "marvinpinto/action-automatic-releases@latest"
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.19" automatic_release_tag: "latest-1.19.1"
prerelease: false prerelease: false
title: "1.19 Build" title: "1.19.1 Build"
files: | files: |
./build/libs/*.jar ./build/libs/*.jar

2
.gitignore vendored
View File

@@ -10,6 +10,8 @@ classes/
*.launch *.launch
# idea # idea
.idea/
*.iml *.iml
*.ipr *.ipr
*.iws *.iws

3
.idea/.gitignore generated vendored
View File

@@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

6
.idea/compiler.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>

19
.idea/gradle.xml generated
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="true" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

65
.idea/jarRepositories.xml generated
View File

@@ -1,65 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven3" />
<option name="name" value="maven3" />
<option name="url" value="https://maven.seedfinding.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven4" />
<option name="name" value="maven4" />
<option name="url" value="https://maven-snapshots.seedfinding.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="UserLocalRemappedMods" />
<option name="name" value="UserLocalRemappedMods" />
<option name="url" value="file:/$PROJECT_DIR$/.gradle/loom-cache/remapped_mods/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenLocal" />
<option name="name" value="MavenLocal" />
<option name="url" value="file:/$MAVEN_REPOSITORY$/" />
</remote-repository>
<remote-repository>
<option name="id" value="Fabric" />
<option name="name" value="Fabric" />
<option name="url" value="https://maven.fabricmc.net/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven2" />
<option name="name" value="maven2" />
<option name="url" value="https://maven.meteordev.org/snapshots" />
</remote-repository>
<remote-repository>
<option name="id" value="Mojang" />
<option name="name" value="Mojang" />
<option name="url" value="https://libraries.minecraft.net/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven5" />
<option name="name" value="maven5" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://maven.meteordev.org/releases" />
</remote-repository>
</component>
</project>

5
.idea/misc.xml generated
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="azul-17" project-jdk-type="JavaSDK" />
</project>

10
.idea/runConfigurations.xml generated
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

12
.idea/runConfigurations/Minecraft_Client.xml generated
View File

@@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Minecraft Client" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="net.fabricmc.devlaunchinjector.Main" />
<module name="meteor-rejects.main" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="VM_PARAMETERS" value="-Dfabric.dli.config=C:\Users\Cloudburst\Desktop\meteor-rejects\.gradle\loom-cache\launch.cfg -Dfabric.dli.env=client -Dfabric.dli.main=net.fabricmc.loader.impl.launch.knot.KnotClient" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/run/" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

2
build.gradle
View File

@@ -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 // 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. // 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. // 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()) { if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion it.options.release = targetVersion
} }

8
gradle.properties
View File

@@ -2,13 +2,13 @@
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G
# Fabric Properties # Fabric Properties
minecraft_version=1.19 minecraft_version=1.19.1
yarn_version=1.19+build.1 yarn_version=1.19.1+build.4
loader_version=0.14.7 loader_version=0.14.8
# Mod Properties # Mod Properties
mod_version = 0.2 mod_version = 0.2
maven_group = anticope.rejects maven_group = anticope.rejects
archives_base_name = meteor-rejects-addon archives_base_name = meteor-rejects-addon
meteor_version=0.5.0 meteor_version=0.5.1

3
src/main/java/anticope/rejects/commands/KickCommand.java
View File

@@ -2,6 +2,7 @@ package anticope.rejects.commands;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import meteordevelopment.meteorclient.utils.player.ChatUtils;
import net.minecraft.client.util.GlfwUtil; import net.minecraft.client.util.GlfwUtil;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
@@ -35,7 +36,7 @@ public class KickCommand extends Command {
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
})); }));
builder.then(literal("chat").executes(ctx -> { builder.then(literal("chat").executes(ctx -> {
mc.player.sendChatMessage("§0§1§"); ChatUtils.sendPlayerMsg("§0§1§");
return SINGLE_SUCCESS; return SINGLE_SUCCESS;
})); }));
builder.then(literal("shutdown").executes(ctx -> { builder.then(literal("shutdown").executes(ctx -> {

2
src/main/java/anticope/rejects/gui/screens/InteractionScreen.java
View File

@@ -187,7 +187,7 @@ public class InteractionScreen extends Screen {
index[0]++; index[0]++;
} }
} }
e.getItemsHand().forEach(itemStack -> { e.getHandItems().forEach(itemStack -> {
if (itemStack != null) { if (itemStack != null) {
stack[index[0]] = itemStack; stack[index[0]] = itemStack;
index[0]++; index[0]++;

4
src/main/java/anticope/rejects/mixin/CommandSuggestorMixin.java
View File

@@ -1,14 +1,14 @@
package anticope.rejects.mixin; package anticope.rejects.mixin;
import anticope.rejects.modules.modifier.NoRenderModifier; 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 net.minecraft.client.util.math.MatrixStack;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(CommandSuggestor.class) @Mixin(ChatInputSuggestor.class)
public class CommandSuggestorMixin { public class CommandSuggestorMixin {
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true) @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
public void onRenderCommandSuggestion(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) { public void onRenderCommandSuggestion(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) {

1
src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java
View File

@@ -23,7 +23,6 @@ public class MineProcessMixin {
@Shadow(remap = false) @Shadow(remap = false)
private List<BlockPos> a; // knownOreLocations private List<BlockPos> a; // knownOreLocations
@Inject(method = "a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V", at = @At("HEAD"), cancellable = true, remap = false) @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) { private void onRescan(List<BlockPos> already, CalculationContext context, CallbackInfo ci) {
OreSim oreSim = Modules.get().get(OreSim.class); OreSim oreSim = Modules.get().get(OreSim.class);

7
src/main/java/anticope/rejects/modules/ChatBot.java
View File

@@ -4,6 +4,7 @@ import java.util.HashMap;
import anticope.rejects.MeteorRejectsAddon; import anticope.rejects.MeteorRejectsAddon;
import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer; import meteordevelopment.meteorclient.gui.utils.StarscriptTextBoxRenderer;
import meteordevelopment.meteorclient.utils.player.ChatUtils;
import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtString; import net.minecraft.nbt.NbtString;
import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
@@ -70,13 +71,13 @@ public class ChatBot extends Module {
for (String cmd : commands.keySet()) { for (String cmd : commands.keySet()) {
if (msg.endsWith(prefix.get()+cmd)) { if (msg.endsWith(prefix.get()+cmd)) {
Script script = compile(commands.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 { try {
var section = MeteorStarscript.ss.run(script); var section = MeteorStarscript.ss.run(script);
mc.player.sendChatMessage(section.text); ChatUtils.sendPlayerMsg(section.text);
} catch (StarscriptError e) { } catch (StarscriptError e) {
MeteorStarscript.printChatError(e); MeteorStarscript.printChatError(e);
mc.player.sendChatMessage("An error occurred"); ChatUtils.sendPlayerMsg("An error occurred");
} }
return; return;
} }