Skip to content

1.20.4 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

1.20.4 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/devbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: devbuild

concurrency:
group: "build-1.20.2"
group: "build-1.20.4"
cancel-in-progress: true

on:
Expand Down Expand Up @@ -30,8 +30,8 @@ jobs:
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.20.2"
automatic_release_tag: "latest-1.20.4"
prerelease: false
title: "1.20.2 Build"
title: "1.20.4 Build"
files: |
./build/libs/*.jar
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'fabric-loom' version '1.7-SNAPSHOT'
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
Expand Down Expand Up @@ -29,7 +29,7 @@ dependencies {
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT"

// Required for loading logo hud element images
modImplementation "net.fabricmc.fabric-api:fabric-resource-loader-v0:+"
modCompileOnly "net.fabricmc.fabric-api:fabric-resource-loader-v0:+"
include "net.fabricmc.fabric-api:fabric-resource-loader-v0:+"
}

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/develop/)
minecraft_version=1.20.2
yarn_version=1.20.2+build.4
loader_version=0.14.23
minecraft_version=1.20.4
yarn_version=1.20.4+build.3
loader_version=0.16.4

# Mod Properties
mod_version=0.2
maven_group=meteordevelopment.addons
archives_base_name=orion

meteor_version=0.5.5
meteor_version=0.5.6
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ private void onTick(TickEvent.Post event) {
for (PlayerEntity player : mc.world.getPlayers()) {
if (isValid(player)) {
burrowedPlayers.add(player);
warning(player.getEntityName() + " is burrowed!");
warning(player.getDisplayName() + " is burrowed!");
}
if (burrowedPlayers.contains(player) && !AutomationUtils.isBurrowed(player, true)) {
burrowedPlayers.remove(player);
warning(player.getEntityName() + " is no longer burrowed.");
warning(player.getDisplayName() + " is no longer burrowed.");
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import meteordevelopment.meteorclient.utils.render.color.RainbowColor;
import meteordevelopment.meteorclient.utils.render.color.SettingColor;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.text.LiteralTextContent;
import net.minecraft.text.MutableText;
import net.minecraft.text.PlainTextContent;
import net.minecraft.text.Text;
import net.minecraft.text.TextColor;
import net.minecraft.util.Formatting;
Expand Down Expand Up @@ -53,8 +53,8 @@ public void onActivate() {


public Text getPrefix() {
MutableText logo = MutableText.of(new LiteralTextContent(""));
MutableText prefix = MutableText.of(new LiteralTextContent(""));
MutableText logo = MutableText.of(PlainTextContent.of(""));
MutableText prefix = MutableText.of(PlainTextContent.of(""));
String logoT = "Orion";
if (customPrefix.get()) logoT = prefixText.get();
if (customPrefixColor.get() && !chromaPrefix.get()) logo.append(Text.literal(logoT).setStyle(logo.getStyle().withColor(TextColor.fromRgb(prefixColor.get().getPacked()))));
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private void onReceivePacket(PacketEvent.Receive event) {
int pops = totemPops.getOrDefault(entity.getUuid(), 0);
totemPops.put(entity.getUuid(), ++pops);

ChatUtils.sendMsg(getChatId(entity), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", entity.getEntityName(), pops, pops == 1 ? "totem" : "totems");
ChatUtils.sendMsg(getChatId(entity), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", entity.getName(), pops, pops == 1 ? "totem" : "totems");
}
if (announceOthers.get() && announceWait <= 1 && mc.player.distanceTo(entity) <= announceRange.get()) {
if (dontAnnounceFriends.get() && Friends.get().isFriend((PlayerEntity) entity)) return;
Expand All @@ -134,7 +134,7 @@ private void onReceivePacket(PacketEvent.Receive event) {
ChatUtils.sendPlayerMsg(popMessage);

if (pmOthers.get()) {
String name = entity.getEntityName();
String name = entity.getName().toString();
Wrapper.messagePlayer(name, StringHelper.stripName(name, popMessage));
}
} catch (StarscriptError error) {
Expand All @@ -160,9 +160,9 @@ private void onTick(TickEvent.Post event) {
if (player.deathTime > 0 || player.getHealth() <= 0) {
int pops = totemPops.removeInt(player.getUuid());

ChatUtils.sendMsg(getChatId(player), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", player.getEntityName(), pops, pops == 1 ? "totem" : "totems");
ChatUtils.sendMsg(getChatId(player), Formatting.GRAY, "(highlight)%s (default)popped (highlight)%d (default)%s.", player.getName(), pops, pops == 1 ? "totem" : "totems");
chatIds.removeInt(player.getUuid());
if (EzUtil.currentTargets.contains(player.getEntityName())) EzUtil.sendAutoEz(player.getEntityName());
if (EzUtil.currentTargets.contains(player.getName().toString())) EzUtil.sendAutoEz(player.getName().toString());
}
}
}
Expand All @@ -174,7 +174,7 @@ private int getChatId(Entity entity) throws StarscriptError {

private String getPopMessage(PlayerEntity p) {
MeteorStarscript.ss.set("pops", totemPops.getOrDefault(p.getUuid(), 0));
MeteorStarscript.ss.set("killed", p.getEntityName());
MeteorStarscript.ss.set("killed", p.getName().toString());

if (popScripts.isEmpty()) {
ChatUtils.warning("Your pop message list is empty!");
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.entity.DamageUtils;
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.entity.SortPriority;
import meteordevelopment.meteorclient.utils.entity.TargetUtils;
Expand Down Expand Up @@ -141,7 +142,7 @@ private void onTick(TickEvent.Post event) {
FindItemResult pick = ItemHelper.findPick();
if (pick.found()) {
Wrapper.updateSlot(pick.slot());
info("Breaking " + target.getEntityName() + "'s self-trap.");
info("Breaking " + target.getDisplayName() + "'s self-trap.");
AutomationUtils.doPacketMine(target.getBlockPos().up(2));
sentTrapMine = true;
return;
Expand All @@ -158,7 +159,7 @@ private void onTick(TickEvent.Post event) {
FindItemResult pick = ItemHelper.findPick();
if (pick.found()) {
Wrapper.updateSlot(pick.slot());
info("Breaking " + target.getEntityName() + "'s burrow");
info("Breaking " + target.getDisplayName() + "'s burrow");
AutomationUtils.doPacketMine(target.getBlockPos());
sentBurrowMine = true;
return;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ private void onTick(TickEvent.Post event) {
if (!isMining) {
isMining = true;
if (!didFirstMine) didFirstMine = true;
info("Citying " + target.getEntityName() + ".");
info("Citying " + target.getDisplayName() + ".");
if (rotate.get()) {
Rotations.rotate(Rotations.getYaw(cityBlock), Rotations.getPitch(cityBlock), () -> mine(cityBlock));
} else {
Expand Down Expand Up @@ -209,7 +209,7 @@ private void onRender(Render3DEvent event) {

@Override
public String getInfoString() {
if (target != null) return target.getEntityName();
if (target != null) return target.getNameForScoreboard();
return null;
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/me/ghosttypes/orion/modules/main/BedAura.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.modules.combat.CrystalAura;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.entity.DamageUtils;
import meteordevelopment.meteorclient.utils.entity.EntityUtils;
import meteordevelopment.meteorclient.utils.entity.SortPriority;
import meteordevelopment.meteorclient.utils.entity.TargetUtils;
Expand Down Expand Up @@ -172,7 +173,7 @@ private void onTick(TickEvent.Post event) {
FindItemResult pick = ItemHelper.findPick();
if (pick.found()) {
Wrapper.updateSlot(pick.slot());
info("Breaking " + target.getEntityName() + "'s self-trap.");
info("Breaking " + target.getDisplayName() + "'s self-trap.");
stb = BedUtils.getSelfTrapBlock(target, preventEscape.get());
AutomationUtils.doPacketMine(stb);
sentTrapMine = true;
Expand All @@ -183,7 +184,7 @@ private void onTick(TickEvent.Post event) {
FindItemResult pick = ItemHelper.findPick();
if (pick.found()) {
Wrapper.updateSlot(pick.slot());
info("Breaking " + target.getEntityName() + "'s burrow.");
info("Breaking " + target.getDisplayName() + "'s burrow.");
AutomationUtils.doPacketMine(target.getBlockPos());
sentBurrowMine = true;
return;
Expand All @@ -194,7 +195,7 @@ private void onTick(TickEvent.Post event) {
if (sword.found()) {
Wrapper.updateSlot(sword.slot());
if (webTimer <= 0) {
info("Breaking " + target.getEntityName() + "'s web.");
info("Breaking " + target.getDisplayName() + "'s web.");
webTimer = 100;
} else {
webTimer--;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private void onTick(TickEvent.Pre event) {
wasBurrowed = true;
BlockPos burrowBlock = target.getBlockPos();
if (!alertedTarget) {
info("Breaking " + target.getEntityName() + "'s burrow!");
info("Breaking " + target.getDisplayName() + "'s burrow!");
alertedTarget = true;
}
Wrapper.updateSlot(pickSlot.slot());
Expand All @@ -77,15 +77,15 @@ private void onTick(TickEvent.Pre event) {
return;
}
if (!AutomationUtils.isBurrowed(target, true) && wasBurrowed) {
info("Broke " + target.getEntityName() + "'s burrow!");
info("Broke " + target.getDisplayName() + "'s burrow!");
if (preventAfter.get()) {
FindItemResult floorBlock = InvUtils.findInHotbar(itemStack -> Block.getBlockFromItem(itemStack.getItem()) instanceof AbstractPressurePlateBlock || Block.getBlockFromItem(itemStack.getItem()) instanceof ButtonBlock);
if (!floorBlock.found()) {
warning("No buttons or plates in hotbar, cannot prevent re-burrow.");
toggle();
}
BlockUtils.place(target.getBlockPos(), floorBlock, true, 0, false);
info("Blocked " + target.getEntityName() + " from re-burrowing!");
info("Blocked " + target.getDisplayName() + " from re-burrowing!");
}
toggle();
}
Expand Down