Skip to content

Commit fcce683

Browse files
committed
1.20.2
1 parent 6019b58 commit fcce683

File tree

8 files changed

+27
-28
lines changed

8 files changed

+27
-28
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ configurations {
2525
dependencies {
2626

2727
minecraft "com.mojang:minecraft:${project.minecraft_version}"
28-
mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
28+
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
2929
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
3030

3131
// Meteor Client

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
org.gradle.jvmargs=-Xmx2G
22

33
# Fabric Properties (https://fabricmc.net/versions.html)
4-
minecraft_version=1.20
5-
yarn_version=1.20+build.1
6-
loader_version=0.14.21
4+
minecraft_version=1.20.2
5+
yarn_mappings=1.20.2+build.4
6+
loader_version=0.14.22
77

88
# Mod Properties
99
mod_version=1.0.3
@@ -13,4 +13,4 @@ archives_base_name=zewo2
1313
# Dependencies
1414

1515
# Meteor (https://maven.meteordev.org/)
16-
meteor_version=0.5.3
16+
meteor_version=0.5.5

src/main/java/com/dark/zewo2/gui/screens/SessionIDScreen.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
import net.minecraft.client.MinecraftClient;
1010
import net.minecraft.client.gui.screen.Screen;
1111
import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
12-
import net.minecraft.client.util.Session;
12+
import net.minecraft.client.session.Session;
1313

1414
import java.util.Optional;
15+
import java.util.UUID;
1516

1617
public class SessionIDScreen extends WindowScreen {
1718
private final MultiplayerScreen multiplayerScreen;
@@ -44,13 +45,13 @@ public void initWidgets() {
4445
t.add(theme.button("Done")).minWidth(220).expandX().widget().action = () -> {
4546
if (ID.get().isEmpty() || UUID.get().isEmpty() || USER.get().isEmpty()) return;
4647

47-
Account.setSession(new Session(USER.get(), UUID.get(), ID.get(), Optional.empty(), Optional.empty(), Session.AccountType.MSA));
48+
Account.setSession(new Session(USER.get(), java.util.UUID.fromString(UUID.get()), ID.get(), Optional.empty(), Optional.empty(), Session.AccountType.MSA));
4849

4950
mc.setScreen(new MultiplayerScreen(this.parent));
5051
};
5152

5253
t.add(theme.button("Return ACC")).minWidth(220).expandX().widget().action = () -> {
53-
Account.setSession(new Session(Addon.BOOTNAME, Addon.BOOTUUID, Addon.BOOTSESSION, Optional.empty(), Optional.empty(), Session.AccountType.MOJANG));
54+
Account.setSession(new Session(Addon.BOOTNAME, java.util.UUID.fromString(Addon.BOOTUUID), Addon.BOOTSESSION, Optional.empty(), Optional.empty(), Session.AccountType.MOJANG));
5455

5556
mc.setScreen(new MultiplayerScreen(this.parent));
5657
};

src/main/java/com/dark/zewo2/gui/settings/SetSession.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.mojang.authlib.GameProfile;
44
import com.mojang.util.UUIDTypeAdapter;
55
import net.minecraft.client.MinecraftClient;
6-
import net.minecraft.client.util.Session;
76
import net.minecraft.network.encryption.PlayerPublicKey;
87
import org.jetbrains.annotations.Nullable;
98

@@ -26,7 +25,7 @@ public class SetSession {
2625
@Nullable
2726
public static java.util.UUID getUuidOrNull() {
2827
try {
29-
return UUIDTypeAdapter.fromString(UUID);
28+
return java.util.UUID.fromString(UUID);
3029
} catch (IllegalArgumentException var2) {
3130
return null;
3231
}

src/main/java/com/dark/zewo2/mixin/PlayerListEntryMixin.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ public abstract class PlayerListEntryMixin {
1717
@Shadow
1818
public abstract GameProfile getProfile();
1919

20-
@Inject(method = "getSkinTexture", at = @At("HEAD"), cancellable = true)
20+
@Inject(method = "getSkinTextures", at = @At("HEAD"), cancellable = true)
2121
private void onGetTexture(CallbackInfoReturnable<Identifier> info) {
2222
if (Modules.get().get(Boykisser.class).isActive()) {
2323
info.setReturnValue(Boykisser.boykisser);
2424
}
2525
}
2626

27-
@Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
28-
private void getModel(CallbackInfoReturnable<String> info) {
29-
if (Modules.get().get(Boykisser.class).isActive()) {
30-
info.setReturnValue("slim");
31-
}
32-
}
27+
// @Inject(method = "", at = @At("HEAD"), cancellable = true)
28+
// private void getModel(CallbackInfoReturnable<String> info) {
29+
// if (Modules.get().get(Boykisser.class).isActive()) {
30+
// info.setReturnValue("slim");
31+
// }
32+
// }
3333
}

src/main/java/com/dark/zewo2/mixin/RenderCapes.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
@Mixin(AbstractClientPlayerEntity.class)
1313
public class RenderCapes {
14-
@Inject(method = "getCapeTexture", at = @At("HEAD"), cancellable = true)
15-
private void onGetCapeTexture(CallbackInfoReturnable<Identifier> info) {
16-
Identifier id = Capes.get((PlayerEntity) (Object) this);
17-
if (id != null) info.setReturnValue(id);
18-
}
14+
// @Inject(method = "getCapeTexture", at = @At("HEAD"), cancellable = true)
15+
// private void onGetCapeTexture(CallbackInfoReturnable<Identifier> info) {
16+
// Identifier id = Capes.get((PlayerEntity) (Object) this);
17+
// if (id != null) info.setReturnValue(id);
18+
// }
1919
}

src/main/java/com/dark/zewo2/mixin/SessionMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.mojang.authlib.GameProfile;
44
import com.dark.zewo2.gui.settings.SetSession;
5-
import net.minecraft.client.util.Session;
5+
import net.minecraft.client.session.Session;
66
import org.spongepowered.asm.mixin.Mixin;
77
import org.spongepowered.asm.mixin.injection.At;
88
import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,13 +30,13 @@ private void getUsername(CallbackInfoReturnable<String> cir) {
3030
cir.setReturnValue(SetSession.username);
3131
}
3232

33-
@Inject(at=@At("TAIL"), method="getUuid", cancellable = true)
33+
@Inject(at=@At("TAIL"), method="getUuidOrNull", cancellable = true)
3434
private void getUuid(CallbackInfoReturnable<String> cir) {
3535
if (SetSession.originalSession) return;
3636
cir.setReturnValue(SetSession.UUID);
3737
}
3838

39-
@Inject(at=@At("TAIL"), method="getProfile", cancellable = true)
39+
@Inject(at=@At("TAIL"), method="getSessionId", cancellable = true)
4040
private void getProfile(CallbackInfoReturnable<GameProfile> cir) {
4141
if (SetSession.originalSession) return;
4242
cir.setReturnValue(SetSession.getGameProfile());

src/main/java/com/dark/zewo2/modules/PingSpoof.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
import net.minecraft.network.packet.Packet;
1313
import net.minecraft.client.util.math.MatrixStack;
1414
import net.minecraft.network.packet.Packet;
15-
import net.minecraft.network.packet.c2s.play.KeepAliveC2SPacket;
16-
import net.minecraft.network.packet.c2s.play.PlayPongC2SPacket;
15+
import net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket;
1716

1817
import java.util.ArrayList;
1918
import java.util.List;
@@ -63,7 +62,7 @@ boolean shouldDelayPacket(Packet<?> p) {
6362
if (mode.get() == Mode.Delay) {
6463
return true; // if we want to delay everything, say yes
6564
} else {
66-
return p instanceof PlayPongC2SPacket || p instanceof KeepAliveC2SPacket; // if we want to fake it, say yes if its a pong or keepalive
65+
return p instanceof KeepAliveC2SPacket; // if we want to fake it, say yes if its a pong or keepalive
6766
}
6867
}
6968

0 commit comments

Comments
 (0)