Skip to content

Commit e981be9

Browse files
committed
switch to mojang mappings
1 parent e5586ea commit e981be9

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ repositories {
2222
dependencies {
2323
// Fabric
2424
minecraft("com.mojang:minecraft:${properties["minecraft_version"] as String}")
25-
mappings("net.fabricmc:yarn:${properties["yarn_mappings"] as String}:v2")
25+
mappings(loom.officialMojangMappings())
2626
modImplementation("net.fabricmc:fabric-loader:${properties["loader_version"] as String}")
2727

2828
// Meteor

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ org.gradle.jvmargs=-Xmx2G
22

33
# Fabric Properties (https://fabricmc.net/develop)
44
minecraft_version=1.21.1
5-
yarn_mappings=1.21.1+build.3
65
loader_version=0.16.10
76

87
# Mod Properties

src/main/java/moe/kyuunex/doujin_dupe/modules/AutoDump.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import meteordevelopment.meteorclient.utils.player.InvUtils;
1010
import meteordevelopment.meteorclient.utils.player.SlotUtils;
1111
import meteordevelopment.orbit.EventHandler;
12-
import net.minecraft.item.Item;
13-
import net.minecraft.item.Items;
14-
import net.minecraft.screen.ScreenHandlerType;
12+
import net.minecraft.world.item.Item;
13+
import net.minecraft.world.item.Items;
14+
import net.minecraft.world.inventory.MenuType;
1515

1616
public class AutoDump extends Module {
1717
private final SettingGroup sgDefault = settings.getDefaultGroup();
@@ -48,12 +48,12 @@ public class AutoDump extends Module {
4848
Items.BLACK_SHULKER_BOX
4949
)
5050
.build());
51-
public final Setting<List<ScreenHandlerType<?>>> screens =
51+
public final Setting<List<MenuType<?>>> screens =
5252
sgDefault.add(
5353
new ScreenHandlerListSetting.Builder()
5454
.name("screens")
5555
.description("The screens to dump items into.")
56-
.defaultValue(List.of(ScreenHandlerType.GENERIC_9X3, ScreenHandlerType.GENERIC_9X6))
56+
.defaultValue(List.of(MenuType.GENERIC_9x3, MenuType.GENERIC_9x6))
5757
.build());
5858

5959
public AutoDump() {
@@ -74,8 +74,8 @@ public void onTick(TickEvent.Post tickEvent) {
7474

7575
for (int i = SlotUtils.indexToId(SlotUtils.MAIN_START); i < SlotUtils.indexToId(SlotUtils.MAIN_START) + 4 * 9; i++) {
7676
if (r >= rate.get()) break;
77-
if (!mc.player.currentScreenHandler.getSlot(i).hasStack()) continue;
78-
if (!items.get().contains(mc.player.currentScreenHandler.getSlot(i).getStack().getItem())) continue;
77+
if (!mc.player.containerMenu.getSlot(i).hasItem()) continue;
78+
if (!items.get().contains(mc.player.containerMenu.getSlot(i).getItem().getItem())) continue;
7979

8080
r++;
8181
InvUtils.shiftClick().slotId(i);
@@ -84,7 +84,7 @@ public void onTick(TickEvent.Post tickEvent) {
8484

8585
public boolean canUseScreen() {
8686
try {
87-
return mc.player != null && screens.get().contains(mc.player.currentScreenHandler.getType());
87+
return mc.player != null && screens.get().contains(mc.player.containerMenu.getType());
8888
} catch (Exception e) {
8989
return false;
9090
}

src/main/java/moe/kyuunex/doujin_dupe/modules/DoujinDupe.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import meteordevelopment.meteorclient.utils.player.FindItemResult;
1212
import meteordevelopment.meteorclient.utils.player.InvUtils;
1313
import meteordevelopment.orbit.EventHandler;
14-
import net.minecraft.client.network.ClientPlayNetworkHandler;
15-
import net.minecraft.item.Item;
16-
import net.minecraft.item.Items;
17-
import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
18-
import net.minecraft.network.ClientConnection;
19-
import net.minecraft.network.packet.Packet;
14+
import net.minecraft.client.multiplayer.ClientPacketListener;
15+
import net.minecraft.world.item.Item;
16+
import net.minecraft.world.item.Items;
17+
import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
18+
import net.minecraft.network.Connection;
19+
import net.minecraft.network.protocol.Packet;
2020

2121
public class DoujinDupe extends Module {
2222
private int idleTimer = 0;
@@ -122,15 +122,15 @@ public void onDeactivate() {
122122

123123
@EventHandler
124124
public void onTick(TickEvent.Post tickEvent) {
125-
if (mc.player == null || mc.interactionManager == null) {
125+
if (mc.player == null || mc.gameMode == null) {
126126
return;
127127
}
128128

129129
idleTimer--;
130130

131131
if (idleTimer > 0) return;
132132

133-
if (mc.player.getOffHandStack().getItem() != Items.WRITABLE_BOOK && bookCheck.get()) {
133+
if (mc.player.getOffhandItem().getItem() != Items.WRITABLE_BOOK && bookCheck.get()) {
134134
warning("No writable book in offhand, disabling.");
135135
toggle();
136136
return;
@@ -156,7 +156,7 @@ public void onTick(TickEvent.Post tickEvent) {
156156
}
157157

158158
public void writeDoujin() {
159-
sendPacket(new BookUpdateC2SPacket(
159+
sendPacket(new ServerboundEditBookPacket(
160160
40,
161161
List.of("A"),
162162
Optional.of(randomText(33)))
@@ -176,10 +176,10 @@ public static String randomText(int amount) {
176176
}
177177

178178
public void sendPacket(Packet<?> packet) {
179-
ClientPlayNetworkHandler network = mc.getNetworkHandler();
179+
ClientPacketListener network = mc.getConnection();
180180
if (network == null) return;
181181

182-
ClientConnection connection = network.getConnection();
182+
Connection connection = network.getConnection();
183183
if (connection == null) return;
184184

185185
connection.channel.writeAndFlush(packet);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
accessWidener v1 named
22

3-
accessible field net/minecraft/network/ClientConnection channel Lio/netty/channel/Channel;
3+
accessible field net/minecraft/network/Connection channel Lio/netty/channel/Channel;

0 commit comments

Comments
 (0)