Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: AntiCope/orion
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: last-1.18.1
Choose a base ref
...
head repository: AntiCope/orion
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 1, 2022

  1. update to 1.18.2

    C10udburst committed Mar 1, 2022
    Copy the full SHA
    7822f1b View commit details

Commits on Mar 2, 2022

  1. fix 1.18.2

    C10udburst committed Mar 2, 2022
    Copy the full SHA
    bdf2d83 View commit details

Commits on Mar 5, 2022

  1. Update README.md

    C10udburst authored Mar 5, 2022
    Copy the full SHA
    7a2c302 View commit details

Commits on Mar 6, 2022

  1. Add space before pops

    Declipsonator authored and C10udburst committed Mar 6, 2022
    Copy the full SHA
    d8dc36e View commit details
  2. Copy the full SHA
    1ff1e53 View commit details

Commits on Mar 15, 2022

  1. Update README.md

    C10udburst authored Mar 15, 2022
    Copy the full SHA
    aafe16e View commit details

Commits on Mar 22, 2022

  1. use the meteor built-in updater

    (click on the name in title screen credits)
    C10udburst committed Mar 22, 2022
    Copy the full SHA
    e4be6c9 View commit details

Commits on Apr 18, 2022

  1. fix #22

    C10udburst authored Apr 18, 2022
    Copy the full SHA
    ed16bd3 View commit details

Commits on May 16, 2022

  1. Copy the full SHA
    22f532b View commit details

Commits on Jun 11, 2022

  1. update to 1.19

    C10udburst committed Jun 11, 2022
    Copy the full SHA
    4f3d61f View commit details

Commits on Jun 19, 2022

  1. Fix auto login

    Dellism authored and C10udburst committed Jun 19, 2022
    Copy the full SHA
    b873342 View commit details
  2. fix #23

    C10udburst committed Jun 19, 2022
    Copy the full SHA
    f278490 View commit details

Commits on Jul 12, 2022

  1. update to newest devbuild

    fixes #25
    C10udburst committed Jul 12, 2022
    Copy the full SHA
    3fd26cf View commit details
  2. use starscript everywhere

    C10udburst committed Jul 12, 2022
    Copy the full SHA
    cda7eef View commit details

Commits on Jul 26, 2022

  1. various fixes

    RacoonDog authored and C10udburst committed Jul 26, 2022
    Copy the full SHA
    12f2ecd View commit details
  2. remove unused imports

    RacoonDog authored and C10udburst committed Jul 26, 2022
    Copy the full SHA
    f00c960 View commit details

Commits on Sep 18, 2022

  1. 1.19.1 + popcounter rework (#27)

    Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
    RacoonDog and C10udburst authored Sep 18, 2022
    Copy the full SHA
    2179b7d View commit details
  2. 1.19.2 and removal of duplicate nametags (#28)

    Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
    hexadecimal233 and C10udburst authored Sep 18, 2022
    Copy the full SHA
    862994c View commit details

Commits on Dec 14, 2022

  1. Update to 1.19.3 (#31)

    RedCarlos26 authored Dec 14, 2022
    Copy the full SHA
    d3918fd View commit details

Commits on Apr 16, 2023

  1. Update to 1.19.4 (Fixed) (#35)

    * Add files via upload
    
    * Add files via upload
    
    * Update devbuild.yml
    
    ---------
    
    Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
    CrytoPal and C10udburst authored Apr 16, 2023
    Copy the full SHA
    63f481a View commit details

Commits on Jul 4, 2023

  1. Updated to 1.20.1 (#40)

    Co-authored-by: Cloudburst <18114966+C10udburst@users.noreply.github.com>
    CrytoPal and C10udburst authored Jul 4, 2023
    Copy the full SHA
    c1fd380 View commit details

Commits on Oct 23, 2023

  1. Update to 1.20.2 (#43)

    RedCarlos26 authored Oct 23, 2023
    Copy the full SHA
    3b66d81 View commit details
Showing with 397 additions and 1,459 deletions.
  1. +0 −67 .github/ISSUE_TEMPLATE/bug.yml
  2. +0 −1 .github/ISSUE_TEMPLATE/config.yml
  3. +0 −12 .github/ISSUE_TEMPLATE/suggestion.yml
  4. +2 −2 .github/workflows/checks.yml
  5. +4 −4 .github/workflows/devbuild.yml
  6. +6 −8 README.md
  7. +8 −8 build.gradle
  8. +7 −5 gradle.properties
  9. +2 −2 gradle/wrapper/gradle-wrapper.properties
  10. +0 −1 settings.gradle
  11. +41 −37 src/main/java/me/ghosttypes/orion/Orion.java
  12. +0 −28 src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java
  13. +0 −22 src/main/java/me/ghosttypes/orion/mixins/TitleScreenMixin.java
  14. +2 −1 src/main/java/me/ghosttypes/orion/modules/chat/AutoLogin.java
  15. +0 −1 src/main/java/me/ghosttypes/orion/modules/chat/BurrowAlert.java
  16. +8 −7 src/main/java/me/ghosttypes/orion/modules/chat/ChatTweaks.java
  17. +73 −37 src/main/java/me/ghosttypes/orion/modules/chat/PopCounter.java
  18. +17 −18 src/main/java/me/ghosttypes/orion/modules/hud/{visual → }/Logo.java
  19. +62 −0 src/main/java/me/ghosttypes/orion/modules/hud/OrionHud.java
  20. +0 −43 src/main/java/me/ghosttypes/orion/modules/hud/items/Beds.java
  21. +0 −42 src/main/java/me/ghosttypes/orion/modules/hud/items/Crystals.java
  22. +0 −42 src/main/java/me/ghosttypes/orion/modules/hud/items/Gaps.java
  23. +0 −96 src/main/java/me/ghosttypes/orion/modules/hud/items/TextItems.java
  24. +0 −42 src/main/java/me/ghosttypes/orion/modules/hud/items/XP.java
  25. +0 −26 src/main/java/me/ghosttypes/orion/modules/hud/misc/Welcome.java
  26. +0 −23 src/main/java/me/ghosttypes/orion/modules/hud/stats/Deaths.java
  27. +0 −14 src/main/java/me/ghosttypes/orion/modules/hud/stats/Highscore.java
  28. +0 −25 src/main/java/me/ghosttypes/orion/modules/hud/stats/KDRatio.java
  29. +0 −16 src/main/java/me/ghosttypes/orion/modules/hud/stats/Kills.java
  30. +0 −14 src/main/java/me/ghosttypes/orion/modules/hud/stats/Killstreak.java
  31. +0 −90 src/main/java/me/ghosttypes/orion/modules/hud/visual/VisualBinds.java
  32. +0 −22 src/main/java/me/ghosttypes/orion/modules/hud/visual/Watermark.java
  33. +10 −10 src/main/java/me/ghosttypes/orion/modules/main/AnchorAura.java
  34. +5 −4 src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java
  35. +2 −2 src/main/java/me/ghosttypes/orion/modules/main/AutoCityPlus.java
  36. +4 −4 src/main/java/me/ghosttypes/orion/modules/main/AutoRespawn.java
  37. +2 −2 src/main/java/me/ghosttypes/orion/modules/main/AutoXP.java
  38. +4 −7 src/main/java/me/ghosttypes/orion/modules/main/BedAura.java
  39. +8 −8 src/main/java/me/ghosttypes/orion/modules/main/BedDisabler.java
  40. +2 −2 src/main/java/me/ghosttypes/orion/modules/main/BurrowBreaker.java
  41. +0 −468 src/main/java/me/ghosttypes/orion/modules/main/NametagsPlus.java
  42. +39 −9 src/main/java/me/ghosttypes/orion/modules/main/RPC.java
  43. +20 −20 src/main/java/me/ghosttypes/orion/modules/main/SelfTrapPlus.java
  44. +21 −21 src/main/java/me/ghosttypes/orion/modules/main/SurroundPlus.java
  45. +0 −36 src/main/java/me/ghosttypes/orion/utils/UpdateUtil.java
  46. +2 −1 src/main/java/me/ghosttypes/orion/utils/Wrapper.java
  47. +19 −14 src/main/java/me/ghosttypes/orion/utils/chat/EzUtil.java
  48. +0 −29 src/main/java/me/ghosttypes/orion/utils/misc/ItemCounter.java
  49. +0 −26 src/main/java/me/ghosttypes/orion/utils/misc/Placeholders.java
  50. +8 −7 src/main/java/me/ghosttypes/orion/utils/player/AutomationUtils.java
  51. +8 −8 src/main/java/me/ghosttypes/orion/utils/player/BedUtils.java
  52. +0 −2 src/main/java/me/ghosttypes/orion/utils/player/InvHelper.java
  53. +0 −1 src/main/java/me/ghosttypes/orion/utils/player/ItemHelper.java
  54. +1 −0 src/main/java/me/ghosttypes/orion/utils/player/PlayerHelper.java
  55. +4 −4 src/main/java/me/ghosttypes/orion/utils/world/BlockHelper.java
  56. +6 −6 src/main/resources/fabric.mod.json
  57. +0 −12 src/main/resources/orion.mixins.json
67 changes: 0 additions & 67 deletions .github/ISSUE_TEMPLATE/bug.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/ISSUE_TEMPLATE/suggestion.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -13,10 +13,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup JDK 16
- name: Setup JDK 17
uses: actions/setup-java@v2
with:
java-version: 16
java-version: 17
distribution: zulu
- name: Build
run: |
8 changes: 4 additions & 4 deletions .github/workflows/devbuild.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: devbuild

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

on:
@@ -26,12 +26,12 @@ jobs:
chmod +x ./gradlew
./gradlew build
- name: Remove *-dev.jar
run: rm ./build/libs/*-dev.jar
run: rm ./build/libs/*-dev.jar || true
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest-1.18"
automatic_release_tag: "latest-1.20.2"
prerelease: false
title: "1.18 Build"
title: "1.20.2 Build"
files: |
./build/libs/*.jar
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -15,17 +15,21 @@
<!-- <a href="https://discord.com/invite/9vGTkfA6H4"><img src="https://img.shields.io/discord/875153727013650482"></a> Discords go poof -->
</div>

<div align="center">
<a href="https://discord.gg/9mrRPGKYU3"><img src="https://invidget.switchblade.xyz/9mrRPGKYU3"></a>
</div>

# How to use
Download the [latest release](https://github.com/AntiCope/orion/releases/latest) and put it in your mods folder with Latest version of [Meteor Client](https://meteorclient.com)

Launch fabric loader for 1.18.x.
Launch fabric loader for 1.20.x.

# Discord
GhostTypes has retired from both Orion and Ion. Ion went to new ownership, and Orion has been left unmaintained.

# Suggestions & Bugs
If you have a suggestion, please check if the feature already exists before making a suggestion.
If you have a bug to report, please makesure you have the latest dev build of both Meteor and Orion.
If you have a bug to report, please make sure you have the latest dev build of both Meteor and Orion.

To top it all off, please provide as much information as you can (eg. Screenshots, Version, Settings/Configs, Crash reports/logs).

@@ -40,7 +44,6 @@ To top it all off, please provide as much information as you can (eg. Screenshot
- Bed Aura
- Bed Disabler
- Burrow Breaker
- Nametags Plus
- Rich Presence
- Self Trap Plus
- Surround Plus
@@ -54,11 +57,6 @@ To top it all off, please provide as much information as you can (eg. Screenshot

### Hud
- Welcome Message
- Item Counter
- Beds
- Crystals
- Golden Apples
- Experience Bottles
- Kill Counter
- Killstreak Counter
- Death Counter
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.10-SNAPSHOT'
id 'fabric-loom' version '1.4-SNAPSHOT'
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
@@ -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,11 @@ dependencies {
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Meteor
modImplementation "meteordevelopment:meteor-client:SNAPSHOT"
modImplementation "meteordevelopment:meteor-client:${project.meteor_version}-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 {
@@ -40,11 +40,11 @@ processResources {
expand "version": project.version

filter { line -> line.replace("@mc_version@", project.minecraft_version) }
filter { line -> line.replace("@gh_hash@", System.getenv("GITHUB_SHA") ?: "unknown") }
filter { line -> line.replace("@gh_hash@", System.getenv("GITHUB_SHA") ?: "") }
}
}

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 16
it.options.release = 17
}
12 changes: 7 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/versions.html)
minecraft_version=1.18.1
yarn_version=1.18.1+build.14
loader_version=0.12.12
# Fabric (https://fabricmc.net/develop/)
minecraft_version=1.20.2
yarn_version=1.20.2+build.4
loader_version=0.14.23

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

meteor_version=0.5.5
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
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-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -5,6 +5,5 @@ pluginManagement {
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
jcenter()
}
}
78 changes: 41 additions & 37 deletions src/main/java/me/ghosttypes/orion/Orion.java
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
package me.ghosttypes.orion;


import com.mojang.logging.LogUtils;
import me.ghosttypes.orion.modules.chat.*;
import me.ghosttypes.orion.modules.hud.items.*;
import me.ghosttypes.orion.modules.hud.misc.Welcome;
import me.ghosttypes.orion.modules.hud.stats.*;
import me.ghosttypes.orion.modules.hud.visual.*;
import me.ghosttypes.orion.modules.hud.Logo;
import me.ghosttypes.orion.modules.hud.OrionHud;
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.hud.Hud;
import meteordevelopment.meteorclient.systems.hud.HudGroup;
import meteordevelopment.meteorclient.systems.modules.Category;
import meteordevelopment.meteorclient.systems.modules.Modules;
import meteordevelopment.meteorclient.systems.hud.HUD;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.item.Items;

import java.lang.invoke.MethodHandles;

import org.slf4j.Logger;

public class Orion extends MeteorAddon {
public static final Logger LOG = LogManager.getLogger();
public static final Logger LOG = LogUtils.getLogger();
public static final Category CATEGORY = new Category("Orion", Items.OBSIDIAN.getDefaultStack());
public static final String VERSION = "0.1";
public static final HudGroup HUD_GROUP = new HudGroup("Orion");
public static final String VERSION = "0.2";

@Override
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());
@@ -46,35 +39,46 @@ public void onInitialize() {
Modules.get().add(new BurrowAlert());
Modules.get().add(new BurrowBreaker());
Modules.get().add(new ChatTweaks());
Modules.get().add(new NametagsPlus());
Modules.get().add(new PopCounter());
Modules.get().add(new RPC());
Modules.get().add(new SelfTrapPlus());
Modules.get().add(new SurroundPlus());

OrionHud.starscriptAdd();
//HUD
HUD hud = Systems.get(HUD.class);
//Item Counters
hud.elements.add(new Beds(hud));
hud.elements.add(new Crystals(hud));
hud.elements.add(new Gaps(hud));
hud.elements.add(new TextItems(hud));
hud.elements.add(new XP(hud));
//Stats
hud.elements.add(new Deaths(hud));
hud.elements.add(new Highscore(hud));
hud.elements.add(new KDRatio(hud));
hud.elements.add(new Killstreak(hud));
hud.elements.add(new Kills(hud));
//Visual
hud.elements.add(new Logo(hud));
hud.elements.add(new VisualBinds(hud));
hud.elements.add(new Watermark(hud));
hud.elements.add(new Welcome(hud));
Hud hud = Systems.get(Hud.class);
hud.register(OrionHud.INFO);
hud.register(Logo.INFO);
}

@Override
public void onRegisterCategories() {
Modules.registerCategory(CATEGORY);
}

@Override
public String getPackage() {
return "me.ghosttypes.orion";
}

@Override
public String getWebsite() {
return "https://github.com/AntiCope/orion";
}

@Override
public GithubRepo getRepo() {
return new GithubRepo("AntiCope", "orion");
}

@Override
public String getCommit() {
String commit = FabricLoader
.getInstance()
.getModContainer("orion")
.get().getMetadata()
.getCustomValue("github:sha")
.getAsString();
return commit.isEmpty() ? null : commit.trim();
}
}
28 changes: 0 additions & 28 deletions src/main/java/me/ghosttypes/orion/mixins/NametagMixin.java

This file was deleted.

Loading