diff --git a/.github/workflows/devbuild.yml b/.github/workflows/devbuild.yml index 9c8cb62..4791ce8 100644 --- a/.github/workflows/devbuild.yml +++ b/.github/workflows/devbuild.yml @@ -1,7 +1,7 @@ name: devbuild concurrency: - group: "build-1.19" + group: "build-1.19.1" cancel-in-progress: true on: @@ -30,8 +30,8 @@ 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/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..cdab806 100644 --- a/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java +++ b/src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java @@ -19,18 +19,15 @@ import meteordevelopment.orbit.EventHandler; import meteordevelopment.starscript.Script; import meteordevelopment.starscript.compiler.Parser; -import meteordevelopment.starscript.utils.StarscriptError; import meteordevelopment.starscript.compiler.Compiler; +import meteordevelopment.starscript.utils.StarscriptError; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; 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 +45,51 @@ 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