From 6934806f317d21c1effce9b4a8868ec807a08e24 Mon Sep 17 00:00:00 2001 From: RacoonDog <32882447+RacoonDog@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:41:36 -0400 Subject: [PATCH 1/5] various fixes --- build.gradle | 6 +++++- src/main/java/me/ghosttypes/orion/Orion.java | 10 +++++++--- .../java/me/ghosttypes/orion/modules/hud/Logo.java | 10 +++++----- .../java/me/ghosttypes/orion/modules/hud/OrionHud.java | 2 +- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 16d8b99..5407ed2 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,11 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Meteor - modImplementation "meteordevelopment:meteor-client:SNAPSHOT" + modImplementation "meteordevelopment:meteor-client:0.5.0-SNAPSHOT" + + // Required for loading logo hud element images + modImplementation "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" + include "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" } processResources { diff --git a/src/main/java/me/ghosttypes/orion/Orion.java b/src/main/java/me/ghosttypes/orion/Orion.java index 02c7710..d5575ee 100644 --- a/src/main/java/me/ghosttypes/orion/Orion.java +++ b/src/main/java/me/ghosttypes/orion/Orion.java @@ -1,6 +1,7 @@ package me.ghosttypes.orion; +import com.mojang.logging.LogUtils; import me.ghosttypes.orion.modules.chat.*; import me.ghosttypes.orion.modules.hud.Logo; import me.ghosttypes.orion.modules.hud.OrionHud; @@ -24,7 +25,7 @@ public class Orion extends MeteorAddon { - public static final Logger LOG = LoggerFactory.getLogger("Orion"); + public static final Logger LOG = LogUtils.getLogger(); public static final Category CATEGORY = new Category("Orion", Items.OBSIDIAN.getDefaultStack()); public static final HudGroup HUD_GROUP = new HudGroup("Orion"); public static final String VERSION = "0.1"; @@ -33,8 +34,6 @@ public class Orion extends MeteorAddon { public void onInitialize() { LOG.info("Initializing Orion"); - MeteorClient.EVENT_BUS.registerLambdaFactory("me.ghosttypes.orion", (lookupInMethod, klass) -> (MethodHandles.Lookup) lookupInMethod.invoke(null, klass, MethodHandles.lookup())); - //Modules Modules.get().add(new AutoBedCraft()); Modules.get().add(new AutoCityPlus()); @@ -66,6 +65,11 @@ public void onRegisterCategories() { Modules.registerCategory(CATEGORY); } + @Override + public String getPackage() { + return "me.ghosttypes.orion"; + } + @Override public String getWebsite() { return "https://github.com/AntiCope/orion"; diff --git a/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java b/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java index 3b68ba1..b9eaada 100644 --- a/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java +++ b/src/main/java/me/ghosttypes/orion/modules/hud/Logo.java @@ -23,16 +23,17 @@ public class Logo extends HudElement { private final SettingGroup sgGeneral = settings.getDefaultGroup(); - private final Setting scale = sgGeneral.add(new DoubleSetting.Builder().name("scale").description("The scale.").defaultValue(2).min(1).sliderMin(1).sliderMax(5).build()); + private final Setting scale = sgGeneral.add(new DoubleSetting.Builder().name("scale").description("The scale.").defaultValue(2).min(1).sliderMin(1).sliderMax(5).onChanged(setting -> update()).build()); public final Setting chroma = sgGeneral.add(new BoolSetting.Builder().name("chroma").description("Chroma logo animation.").defaultValue(false).build()); - private final Setting chromaSpeed = sgGeneral.add(new DoubleSetting.Builder().name("chroma-speed").description("Speed of the chroma animation.").defaultValue(0.09).min(0.01).sliderMax(5).decimalPlaces(2).build()); - private final Setting color = sgGeneral.add(new ColorSetting.Builder().name("background-color").description("Color of the background.").defaultValue(new SettingColor(255, 255, 255)).build()); + private final Setting chromaSpeed = sgGeneral.add(new DoubleSetting.Builder().name("chroma-speed").description("Speed of the chroma animation.").defaultValue(0.09).min(0.01).sliderMax(5).decimalPlaces(2).onChanged(setting -> RAINBOW.setSpeed(setting / 100)).build()); + private final Setting color = sgGeneral.add(new ColorSetting.Builder().name("logo-color").description("Color of the logo.").defaultValue(new SettingColor(255, 255, 255)).build()); public Logo() { super(INFO); update(); + RAINBOW.setSpeed(chromaSpeed.get() / 100); } - + public void update() { setSize(78 * scale.get(), 96 * scale.get()); } @@ -47,7 +48,6 @@ public void render(HudRenderer renderer) { } Renderer2D.TEXTURE.begin(); if (chroma.get()) { - RAINBOW.setSpeed(chromaSpeed.get() / 100); Renderer2D.TEXTURE.texQuad(x, y, getWidth(), getHeight(), RAINBOW.getNext()); } else { Renderer2D.TEXTURE.texQuad(x, y, getWidth(), getHeight(), color.get()); diff --git a/src/main/java/me/ghosttypes/orion/modules/hud/OrionHud.java b/src/main/java/me/ghosttypes/orion/modules/hud/OrionHud.java index 06addcc..158fd75 100644 --- a/src/main/java/me/ghosttypes/orion/modules/hud/OrionHud.java +++ b/src/main/java/me/ghosttypes/orion/modules/hud/OrionHud.java @@ -29,7 +29,7 @@ public class OrionHud { KILLS = addPreset("Kills", "Kills: #1{stats.kills}"); DEATHS = addPreset("Deaths", "Deaths: #1{stats.deaths}"); HIGHSCORE = addPreset("Highscore", "Highscore: #1{stats.highscore}"); - KDRATIO = addPreset("KD", "K/D: : #1{stats.deaths == 0 ? stats.kills : round(stats.kills / stats.deaths, 2)}"); + KDRATIO = addPreset("KD", "K/D: #1{stats.deaths == 0 ? stats.kills : round(stats.kills / stats.deaths, 2)}"); KILLSTREAK = addPreset("Kill Streak", "Kill Streak: #1{stats.kill_streak}"); } From bb7de65343971351af2477f9acbb66136da83a61 Mon Sep 17 00:00:00 2001 From: RacoonDog <32882447+RacoonDog@users.noreply.github.com> Date: Tue, 26 Jul 2022 14:42:38 -0400 Subject: [PATCH 2/5] remove unused imports --- src/main/java/me/ghosttypes/orion/Orion.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/me/ghosttypes/orion/Orion.java b/src/main/java/me/ghosttypes/orion/Orion.java index d5575ee..cd507ed 100644 --- a/src/main/java/me/ghosttypes/orion/Orion.java +++ b/src/main/java/me/ghosttypes/orion/Orion.java @@ -8,7 +8,6 @@ import me.ghosttypes.orion.modules.main.*; import meteordevelopment.meteorclient.addons.GithubRepo; import meteordevelopment.meteorclient.addons.MeteorAddon; -import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.systems.Systems; import meteordevelopment.meteorclient.systems.modules.Category; import meteordevelopment.meteorclient.systems.modules.Modules; @@ -16,13 +15,10 @@ import meteordevelopment.meteorclient.systems.hud.HudGroup; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.item.Items; -import java.lang.invoke.MethodHandles; - public class Orion extends MeteorAddon { public static final Logger LOG = LogUtils.getLogger(); From 52c275776073011c238ec431a7fdb4e291bf75f9 Mon Sep 17 00:00:00 2001 From: RacoonDog <32882447+RacoonDog@users.noreply.github.com> Date: Sun, 31 Jul 2022 02:57:20 -0400 Subject: [PATCH 3/5] 1.19.1 + popcounter rework cache script to get immediate feedback + prevent runtime errors made randoms static made suffix customizable --- build.gradle | 8 +- gradle.properties | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../ghosttypes/orion/mixins/NametagMixin.java | 2 - .../orion/modules/chat/PopCounter.java | 77 ++++++++++++------- .../orion/modules/main/AutoRespawn.java | 8 +- .../me/ghosttypes/orion/utils/Wrapper.java | 3 +- .../ghosttypes/orion/utils/chat/EzUtil.java | 41 +++------- src/main/resources/fabric.mod.json | 3 +- 9 files changed, 74 insertions(+), 78 deletions(-) diff --git a/build.gradle b/build.gradle index 5407ed2..e75c4ef 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,6 @@ version = project.mod_version group = project.maven_group repositories { - maven { - name = "jitpack" - url = "https://jitpack.io" - } maven { name = "meteor-maven" url = "https://maven.meteordev.org/releases" @@ -30,7 +26,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Meteor - modImplementation "meteordevelopment:meteor-client:0.5.0-SNAPSHOT" + modImplementation "meteordevelopment:meteor-client:0.5.1-SNAPSHOT" // Required for loading logo hud element images modImplementation "net.fabricmc.fabric-api:fabric-resource-loader-v0:+" @@ -50,5 +46,5 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" - it.options.release = 16 + it.options.release = 17 } diff --git a/gradle.properties b/gradle.properties index a9ee36b..6a44b73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx2G # Fabric (https://fabricmc.net/versions.html) -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.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4605298..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java b/src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java index 5ed61e5..36c9751 100644 --- a/src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java +++ b/src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java @@ -18,8 +18,6 @@ @Mixin(EntityRenderer.class) public abstract class NametagMixin implements IEntityRenderer { - @Shadow - public abstract Identifier getTexture(Entity entity); @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true) private void onRenderLabel(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo info) { if (!(entity instanceof PlayerEntity)) return; diff --git a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java index 86ca243..2242b4a 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java @@ -19,7 +19,6 @@ import meteordevelopment.orbit.EventHandler; import meteordevelopment.starscript.Script; import meteordevelopment.starscript.compiler.Parser; -import meteordevelopment.starscript.utils.StarscriptError; import meteordevelopment.starscript.compiler.Compiler; import net.minecraft.entity.Entity; @@ -27,10 +26,7 @@ import net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket; import net.minecraft.util.Formatting; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.UUID; +import java.util.*; public class PopCounter extends Module { @@ -48,22 +44,49 @@ public class PopCounter extends Module { private final Setting dontAnnounceFriends = sgGeneral.add(new BoolSetting.Builder().name("dont-announce-friends").description("Don't annnounce when your friends pop.").defaultValue(true).build()); public final Setting autoEz = sgAutoEz.add(new BoolSetting.Builder().name("auto-ez").description("Sends a message when you kill players.").defaultValue(false).build()); public final Setting suffix = sgAutoEz.add(new BoolSetting.Builder().name("suffix").description("Add Orion suffix to the end of pop messages.").defaultValue(false).visible(autoEz::get).build()); + public final Setting suffixMessage = sgAutoEz.add(new StringSetting.Builder().name("suffix-message").description("The suffix to be added at the end of pop messages.").renderer(StarscriptTextBoxRenderer.class).defaultValue(" | {orion_prefix} {orion_version}").visible(suffix::get).onChanged(e -> updateSuffixScript()).build()); public final Setting killStr = sgAutoEz.add(new BoolSetting.Builder().name("killstreak").description("Add your killstreak to the end of autoez messages").defaultValue(false).visible(autoEz::get).build()); public final Setting pmEz = sgAutoEz.add(new BoolSetting.Builder().name("pm-ez").description("Send the autoez message to the player's dm.").defaultValue(false).visible(autoEz::get).build()); - private final Setting> popMessages = sgMessages.add(new StringListSetting.Builder().name("pop-messages").description("Messages to use when announcing pops.").defaultValue(Collections.emptyList()).build()); - public final Setting> ezMessages = sgMessages.add(new StringListSetting.Builder().name("ez-messages").description("Messages to use for autoez.").renderer(StarscriptTextBoxRenderer.class).defaultValue(Collections.emptyList()).visible(autoEz::get).build()); + public final Setting> popMessages = sgMessages.add(new StringListSetting.Builder().name("pop-messages").description("Messages to use when announcing pops.").renderer(StarscriptTextBoxRenderer.class).defaultValue(Collections.emptyList()).onChanged(e -> updatePopScripts()).build()); + public final Setting> ezMessages = sgMessages.add(new StringListSetting.Builder().name("ez-messages").description("Messages to use for autoez.").renderer(StarscriptTextBoxRenderer.class).defaultValue(Collections.emptyList()).visible(() -> autoEz.get() || announceOthers.get()).onChanged(e -> updateEzScripts()).build()); public final Object2IntMap totemPops = new Object2IntOpenHashMap<>(); private final Object2IntMap chatIds = new Object2IntOpenHashMap<>(); - private final Random random = new Random(); + private static final Random RANDOM = new Random(); private int updateWait = 45; + public Script suffixScript; + private final List