Skip to content

Commit b6851b2

Browse files
PyrofabPyrofab
committed
Update to 1.21.6
1 parent 7a61e9e commit b6851b2

File tree

4 files changed

+147
-10
lines changed

4 files changed

+147
-10
lines changed

‎changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
------------------------------------------------------
2+
Version 0.16.0
3+
------------------------------------------------------
4+
Updated to 1.21.6
5+
16
------------------------------------------------------
27
Version 0.15.0
38
------------------------------------------------------

‎gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/versions.html
6-
minecraft_version=25w09b
7-
yarn_mappings=25w09b+build.6
8-
loader_version=0.16.10
6+
minecraft_version=1.21.6
7+
yarn_mappings=1.21.6+build.1
8+
loader_version=0.16.14
99

1010
# Fabric API
1111
java_version=21
1212

1313
# Mod Properties
14-
mod_version = 0.15.0
14+
mod_version = 0.16.0
1515
maven_group = org.ladysnake
1616
archives_base_name = elmendorf
1717

@@ -20,5 +20,5 @@ org.gradle.jvmargs=-Xmx1G
2020
owners = Ladysnake
2121

2222
# Dependencies
23-
fabric_version=0.118.2+1.21.5
23+
fabric_version=0.127.0+1.21.6
2424
cca_version=6.2.2

‎src/main/java/org/ladysnake/elmendorf/impl/MockClientConnection.java

Lines changed: 135 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
package org.ladysnake.elmendorf.impl;
22

3-
import net.minecraft.network.*;
3+
import io.netty.channel.Channel;
4+
import io.netty.channel.ChannelFuture;
5+
import io.netty.channel.ChannelFutureListener;
6+
import io.netty.util.concurrent.Future;
7+
import io.netty.util.concurrent.GenericFutureListener;
8+
import net.minecraft.network.ClientConnection;
9+
import net.minecraft.network.DisconnectionInfo;
10+
import net.minecraft.network.NetworkSide;
411
import net.minecraft.network.listener.PacketListener;
512
import net.minecraft.network.packet.Packet;
13+
import net.minecraft.network.state.NetworkState;
14+
import org.jetbrains.annotations.NotNull;
615
import org.jetbrains.annotations.Nullable;
716
import org.ladysnake.elmendorf.impl.mixin.ClientConnectionAccessor;
817

18+
import java.util.concurrent.TimeUnit;
19+
920
public class MockClientConnection extends ClientConnection {
1021
public MockClientConnection(NetworkSide side) {
1122
super(side);
@@ -22,8 +33,129 @@ public boolean isOpen() {
2233
}
2334

2435
@Override
25-
public void send(Packet<?> packet, @Nullable PacketCallbacks callback, boolean flush) {
26-
if (callback != null) callback.onSuccess();
36+
public void send(Packet<?> packet, @Nullable ChannelFutureListener callback, boolean flush) {
37+
if (callback != null) {
38+
try {
39+
callback.operationComplete(new ChannelFuture() {
40+
@Override
41+
public Channel channel() {
42+
return null;
43+
}
44+
45+
@Override
46+
public ChannelFuture addListener(GenericFutureListener<? extends Future<? super Void>> listener) {
47+
return null;
48+
}
49+
50+
@Override
51+
public ChannelFuture addListeners(GenericFutureListener<? extends Future<? super Void>>[] listeners) {
52+
return null;
53+
}
54+
55+
@Override
56+
public ChannelFuture removeListener(GenericFutureListener<? extends Future<? super Void>> listener) {
57+
return null;
58+
}
59+
60+
@Override
61+
public ChannelFuture removeListeners(GenericFutureListener<? extends Future<? super Void>>[] listeners) {
62+
return null;
63+
}
64+
65+
@Override
66+
public ChannelFuture sync() {
67+
return null;
68+
}
69+
70+
@Override
71+
public ChannelFuture syncUninterruptibly() {
72+
return null;
73+
}
74+
75+
@Override
76+
public ChannelFuture await() {
77+
return null;
78+
}
79+
80+
@Override
81+
public ChannelFuture awaitUninterruptibly() {
82+
return null;
83+
}
84+
85+
@Override
86+
public boolean isVoid() {
87+
return true;
88+
}
89+
90+
@Override
91+
public boolean isSuccess() {
92+
return true;
93+
}
94+
95+
@Override
96+
public boolean isCancellable() {
97+
return false;
98+
}
99+
100+
@Override
101+
public Throwable cause() {
102+
return null;
103+
}
104+
105+
@Override
106+
public boolean await(long l, TimeUnit timeUnit) {
107+
return false;
108+
}
109+
110+
@Override
111+
public boolean await(long l) {
112+
return false;
113+
}
114+
115+
@Override
116+
public boolean awaitUninterruptibly(long l, TimeUnit timeUnit) {
117+
return false;
118+
}
119+
120+
@Override
121+
public boolean awaitUninterruptibly(long l) {
122+
return false;
123+
}
124+
125+
@Override
126+
public Void getNow() {
127+
return null;
128+
}
129+
130+
@Override
131+
public boolean cancel(boolean b) {
132+
return false;
133+
}
134+
135+
@Override
136+
public boolean isCancelled() {
137+
return false;
138+
}
139+
140+
@Override
141+
public boolean isDone() {
142+
return true;
143+
}
144+
145+
@Override
146+
public Void get() {
147+
return null;
148+
}
149+
150+
@Override
151+
public Void get(long timeout, @NotNull TimeUnit unit) {
152+
return null;
153+
}
154+
});
155+
} catch (Exception e) {
156+
throw new RuntimeException(e);
157+
}
158+
}
27159
}
28160

29161
@Override

‎src/main/java/org/ladysnake/elmendorf/impl/TestableMockClientConnection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
*/
2323
package org.ladysnake.elmendorf.impl;
2424

25+
import io.netty.channel.ChannelFutureListener;
2526
import net.minecraft.entity.Entity;
2627
import net.minecraft.network.NetworkSide;
2728
import net.minecraft.network.PacketByteBuf;
28-
import net.minecraft.network.PacketCallbacks;
2929
import net.minecraft.network.packet.CustomPayload;
3030
import net.minecraft.network.packet.Packet;
3131
import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
@@ -58,7 +58,7 @@ public TestableMockClientConnection(NetworkSide side, TestContext ctx) {
5858
}
5959

6060
@Override
61-
public void send(Packet<?> packet, @Nullable PacketCallbacks callback, boolean flush) {
61+
public void send(Packet<?> packet, @Nullable ChannelFutureListener callback, boolean flush) {
6262
this.packetQueue.add(new TestableMockClientConnection.SentPacket(packet, this.ticks));
6363
super.send(packet, callback, flush);
6464
}

0 commit comments

Comments
 (0)