Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<h1 align="center">Genyo Addon</h1>
<p align="center"><i>❤꧁ღ⊱♥ I have brain damge ♥⊱ღ꧂❤</i></p>
<p align="center" style="font-size: 16px;">Shoreline port into <strong><a href="https://github.com/MeteorDevelopment/meteor-client">Meteor 1.21.4</a></strong> plus other <strong>GENYO magic</strong> :D</p>
<p align="center" style="font-size: 16px;">Shoreline port into <strong><a href="https://github.com/MeteorDevelopment/meteor-client">Meteor 1.21.11</a></strong> plus other <strong>GENYO magic</strong> :D</p>

<div align="center">
<a href="https://github.com/wuritz/genyo-addon/releases">
Expand All @@ -31,7 +31,8 @@ You don't need anything more, we have everything you've ever wanted. Also things
[Check out the website.](https://genyo.dev)

International version: **Genyo Addon**<br>
*written for **Meteor 1.21.4***
*written for **Meteor 1.21.11***<br>
Thank you [Sleeepyv](https://github.com/Sleeepyv) for updating Genyo.

## Features ✨

Expand All @@ -53,5 +54,6 @@ International version: **Genyo Addon**<br>
<dd> - meteor for being awesome</dd>
<dd> - Credit to <strong>"John Genyo"</strong>, the founder of <em>Genyo Corporations</em></dd>
<dd> - also <a href="https://github.com/Skitttyy/shoreline-client">Shoreline</a> for being shorelineistic</dd>
<dd> - <a href="https://github.com/Sleeepyv">Sleeepyv</a> for updating to 1.21.11</dd>
<dd> - and other clients lol</dd>
</dl>
10 changes: 8 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'base'
id "fabric-loom" version "1.11-SNAPSHOT"
id "fabric-loom" version "1.14-SNAPSHOT"
}

version = project.mod_version
Expand Down Expand Up @@ -35,7 +35,7 @@ dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation fabricApi.module("fabric-registry-sync-v0", "0.119.4+1.21.4")
modImplementation fabricApi.module("fabric-registry-sync-v0", "0.139.5+1.21.11")

// Meteor
modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT"
Expand All @@ -46,6 +46,12 @@ dependencies {

implementation "com.ferra13671:discord-ipc:1.2"
include 'com.ferra13671:discord-ipc:1.2'

// Jackson
implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
include 'com.fasterxml.jackson.core:jackson-databind:2.15.2'


}

tasks {
Expand Down
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
org.gradle.jvmargs=-Xmx2G
org.gradle.configuration-cache=false

# Fabric Properties (https://fabricmc.net/develop)
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.8
loader_version=0.16.4
minecraft_version=1.21.11
yarn_mappings=1.21.11+build.3
loader_version=0.18.2

# Mod Properties
mod_version=1.1.1
mod_version=2.0.0
maven_group=com.genyo
archives_base_name=genyo-addon

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
40 changes: 22 additions & 18 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 13 additions & 12 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/main/java/com/genyo/Genyo.java
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ private void initSystems() {

private void initModules(Modules modules) {
modules.add(new GenyoAutoEZ());
modules.add(new AngelSexHulkenberg());
modules.add(new GenyoSurround());
modules.add(new GenyoWelcome());
modules.add(new GenyoSkinBlink());
Expand All @@ -156,6 +155,7 @@ private void initModules(Modules modules) {
modules.add(new CombatBrainrot());
modules.add(new PacketDebug());
modules.add(new GenyoAutoMine());
modules.add(new GenyoAutoMineV2());
modules.add(new GenyoAutoXP());
modules.add(new GenyoAutoArmor());
modules.add(new GenyoAutoTrap());
Expand Down Expand Up @@ -193,6 +193,7 @@ private void initHUD(Hud hud) {
hud.register(BetterPlayerRadarHud.INFO);
hud.register(LogoHud.INFO);
hud.register(PingHud.INFO);
hud.register(GenyoTargetHud.INFO);

HUD_ELEMENTS.add(PvPNeccessaryHud.INFO);
HUD_ELEMENTS.add(ActiveGenyoHud.INFO);
Expand All @@ -201,6 +202,7 @@ private void initHUD(Hud hud) {
HUD_ELEMENTS.add(BetterPlayerRadarHud.INFO);
HUD_ELEMENTS.add(LogoHud.INFO);
HUD_ELEMENTS.add(PingHud.INFO);
HUD_ELEMENTS.add(GenyoTargetHud.INFO);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/genyo/commands/EnemiesCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
.then((argument("player", PlayerListEntryArgumentTypeEx.create())
.executes(context -> {
GameProfile profile = PlayerListEntryArgumentTypeEx.get(context).getProfile();
if (profile.getName().equals(mc.player.getGameProfile().getName())) {
if (profile.name().equals(mc.player.getGameProfile().name())) {
GenyoChatUtils.sendError("You can't add yourself as enemy.");
return SINGLE_SUCCESS;
}

Enemy enemy = new Enemy(profile.getName(), profile.getId());
Enemy enemy = new Enemy(profile.name(), profile.id());

if (Enemies.get().add(enemy)) {
GenyoChatUtils.sendMessage(Formatting.GRAY + "Added %s to enemies.".formatted(enemy.getName()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public PlayerListEntry parse(StringReader reader) throws CommandSyntaxException
PlayerListEntry playerListEntry = null;

for (PlayerListEntry p : mc.getNetworkHandler().getPlayerList()) {
if (p.getProfile().getName().equalsIgnoreCase(argument)) {
if (p.getProfile().name().equalsIgnoreCase(argument)) {
playerListEntry = p;
break;
}
Expand All @@ -52,12 +52,12 @@ public PlayerListEntry parse(StringReader reader) throws CommandSyntaxException
@Override
public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
Collection<PlayerListEntry> playerListEntries = mc.getNetworkHandler().getPlayerList();
PlayerListEntry clientEntry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getGameProfile().getName());
PlayerListEntry clientEntry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getGameProfile().name());
if (playerListEntries.contains(clientEntry)) playerListEntries.remove(clientEntry);

// just made this to exclude yourself from the list, it was kinda annoying.

return CommandSource.suggestMatching(playerListEntries.stream().map(playerListEntry -> playerListEntry.getProfile().getName()), builder);
return CommandSource.suggestMatching(playerListEntries.stream().map(playerListEntry -> playerListEntry.getProfile().name()), builder);
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/genyo/core/render/Interpolation.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public static Vec3d getRenderPosition(Entity entity, float tickDelta)
*/
public static Vec3d getInterpolatedPosition(Entity entity, float tickDelta)
{
return new Vec3d(entity.prevX + ((entity.getX() - entity.prevX) * tickDelta),
entity.prevY + ((entity.getY() - entity.prevY) * tickDelta),
entity.prevZ + ((entity.getZ() - entity.prevZ) * tickDelta));
return new Vec3d(entity.lastX + ((entity.getX() - entity.lastX) * tickDelta),
entity.lastY + ((entity.getY() - entity.lastY) * tickDelta),
entity.lastZ + ((entity.getZ() - entity.lastZ) * tickDelta));
}

/**
Expand Down Expand Up @@ -73,7 +73,7 @@ public static double interpolateDouble(double prev, double value, double factor)
public static Box getInterpolatedBox(Box prevBox, Box box)
{

double delta = mc.isPaused() ? 1f : mc.getRenderTickCounter().getTickDelta(true);
double delta = mc.isPaused() ? 1f : mc.getRenderTickCounter().getTickProgress(true);

return new Box(interpolateDouble(prevBox.minX, box.minX, delta),
interpolateDouble(prevBox.minY, box.minY, delta),
Expand All @@ -90,7 +90,7 @@ public static Box getInterpolatedBox(Box prevBox, Box box)
public static Box getInterpolatedEntityBox(Entity entity)
{
Box box = entity.getBoundingBox();
Box prevBox = entity.getBoundingBox().offset(entity.prevX - entity.getX(), entity.prevY - entity.getY(), entity.prevZ - entity.getZ());
Box prevBox = entity.getBoundingBox().offset(entity.lastX - entity.getX(), entity.lastY - entity.getY(), entity.lastZ - entity.getZ());
return getInterpolatedBox(prevBox, box);
}

Expand Down
17 changes: 17 additions & 0 deletions src/main/java/com/genyo/core/sound/SoundManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@

public class SoundManager {

public static final Identifier GUI_HOVER_ID = Identifier.of("genyo:gui_hover");
public static final SoundEvent GUI_HOVER = SoundEvent.of(GUI_HOVER_ID);

public static final Identifier GUI_CLICK_LEFT_ID = Identifier.of("genyo:gui_click_left");
public static final SoundEvent GUI_CLICK_LEFT = SoundEvent.of(GUI_CLICK_LEFT_ID);

public static final Identifier GUI_CLICK_RIGHT_ID = Identifier.of("genyo:gui_click_right");
public static final SoundEvent GUI_CLICK_RIGHT = SoundEvent.of(GUI_CLICK_RIGHT_ID);

public static final Identifier VINE_ID = Identifier.of("genyo:vine");
public static final SoundEvent VINE = SoundEvent.of(VINE_ID);

Expand All @@ -31,6 +40,11 @@ public class SoundManager {
public static final Identifier KIWI_ID = Identifier.of("genyo:kiwi");
public static final SoundEvent KIWI = SoundEvent.of(KIWI_ID);

public void playUISound(SoundEvent sound, float volume, float pitch) {
mc.getSoundManager().play(
net.minecraft.client.sound.PositionedSoundInstance.master(sound, pitch, volume)
);
}
public void playSound(SoundEvent sound) {
if (mc.player != null && mc.world != null && GenyoConfig.get() != null) {
mc.player.playSound(sound, (float) GenyoConfig.get().globalVolume.get() / 100f, 1f);
Expand All @@ -57,6 +71,9 @@ public static void init() {
Registry.register(Registries.SOUND_EVENT, BLACK_ID, BLACK);
Registry.register(Registries.SOUND_EVENT, KEYPRESS_ID, KEYPRESS);
Registry.register(Registries.SOUND_EVENT, KIWI_ID, KIWI);
Registry.register(Registries.SOUND_EVENT, GUI_HOVER_ID, GUI_HOVER);
Registry.register(Registries.SOUND_EVENT, GUI_CLICK_LEFT_ID, GUI_CLICK_LEFT);
Registry.register(Registries.SOUND_EVENT, GUI_CLICK_RIGHT_ID, GUI_CLICK_RIGHT);
}

}
Loading
Loading