Skip to content

Commit 0cb70b0

Browse files
FlorianMichaelFlorianMichael
committed
Rename protocol packages and classes
1 parent 2f7f108 commit 0cb70b0

File tree

53 files changed

+286
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+286
-286
lines changed

‎common/src/main/java/com/viaversion/viarewind/api/ViaRewindPlatform.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import com.viaversion.viarewind.ViaRewind;
2121
import com.viaversion.viarewind.ViaRewindConfig;
22-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.Protocol1_7_2_5To1_7_6_10;
23-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
24-
import com.viaversion.viarewind.protocol.protocol1_8to1_9.Protocol1_8To1_9;
22+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.Protocol1_7_6_10To1_7_2_5;
23+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
24+
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
2525
import com.viaversion.viaversion.api.Via;
2626
import com.viaversion.viaversion.api.protocol.ProtocolManager;
2727
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -51,10 +51,10 @@ default void init(final File configFile) {
5151

5252
getLogger().info("Registering protocols...");
5353
final ProtocolManager protocolManager = Via.getManager().getProtocolManager();
54-
protocolManager.registerProtocol(new Protocol1_7_2_5To1_7_6_10(), ProtocolVersion.v1_7_2, ProtocolVersion.v1_7_6);
55-
protocolManager.registerProtocol(new Protocol1_7_6_10To1_8(), ProtocolVersion.v1_7_6, ProtocolVersion.v1_8);
54+
protocolManager.registerProtocol(new Protocol1_7_6_10To1_7_2_5(), ProtocolVersion.v1_7_2, ProtocolVersion.v1_7_6);
55+
protocolManager.registerProtocol(new Protocol1_8To1_7_6_10(), ProtocolVersion.v1_7_6, ProtocolVersion.v1_8);
5656

57-
protocolManager.registerProtocol(new Protocol1_8To1_9(), ProtocolVersion.v1_8, ProtocolVersion.v1_9);
57+
protocolManager.registerProtocol(new Protocol1_9To1_8(), ProtocolVersion.v1_8, ProtocolVersion.v1_9);
5858
}
5959

6060
/**

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_2_5to1_7_6_10/ClientboundPackets1_7_2_5.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_7_6_10to1_7_2_5/ClientboundPackets1_7_2_5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
18+
package com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5;
1919

2020
import com.viaversion.viaversion.api.protocol.packet.ClientboundPacketType;
2121

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_2_5to1_7_6_10/Protocol1_7_2_5To1_7_6_10.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_7_6_10to1_7_2_5/Protocol1_7_6_10To1_7_2_5.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
18+
package com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5;
1919

2020
import com.viaversion.viarewind.api.type.Types1_7_6_10;
2121
import com.viaversion.viaversion.api.protocol.AbstractProtocol;
@@ -30,7 +30,7 @@
3030
import java.util.List;
3131
import java.util.stream.Collectors;
3232

33-
public class Protocol1_7_2_5To1_7_6_10 extends AbstractProtocol<ClientboundPackets1_7_2_5, ClientboundPackets1_7_2_5, ServerboundPackets1_7_2_5, ServerboundPackets1_7_2_5> {
33+
public class Protocol1_7_6_10To1_7_2_5 extends AbstractProtocol<ClientboundPackets1_7_2_5, ClientboundPackets1_7_2_5, ServerboundPackets1_7_2_5, ServerboundPackets1_7_2_5> {
3434

3535
public static final ValueTransformer<String, String> REMOVE_DASHES = new ValueTransformer<String, String>(Type.STRING) {
3636
@Override
@@ -39,7 +39,7 @@ public String transform(PacketWrapper wrapper, String s) {
3939
}
4040
};
4141

42-
public Protocol1_7_2_5To1_7_6_10() {
42+
public Protocol1_7_6_10To1_7_2_5() {
4343
super(ClientboundPackets1_7_2_5.class, ClientboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class, ServerboundPackets1_7_2_5.class);
4444
}
4545

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_2_5to1_7_6_10/ServerboundPackets1_7_2_5.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_7_6_10to1_7_2_5/ServerboundPackets1_7_2_5.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10;
18+
package com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5;
1919

2020
import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
2121

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/Protocol1_7_6_10To1_8.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/Protocol1_8To1_7_6_10.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10;
1919

2020
import com.viaversion.viabackwards.api.BackwardsProtocol;
2121
import com.viaversion.viarewind.ViaRewind;
2222
import com.viaversion.viarewind.api.data.RewindMappings;
23-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
24-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
25-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetadataRewriter1_7_6_10To1_8;
26-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets.*;
27-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.CompressionHandlerProvider;
28-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.provider.compression.TrackingCompressionHandlerProvider;
29-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.*;
30-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.task.WorldBorderUpdateTask;
23+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.ClientboundPackets1_7_2_5;
24+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.ServerboundPackets1_7_2_5;
25+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.metadata.MetadataRewriter1_7_6_10To1_8;
26+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.packets.*;
27+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.CompressionHandlerProvider;
28+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.provider.compression.TrackingCompressionHandlerProvider;
29+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.*;
30+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.task.WorldBorderUpdateTask;
3131
import com.viaversion.viaversion.api.Via;
3232
import com.viaversion.viaversion.api.connection.UserConnection;
3333
import com.viaversion.viaversion.api.minecraft.ClientWorld;
@@ -44,14 +44,14 @@
4444

4545
import java.util.concurrent.TimeUnit;
4646

47-
public class Protocol1_7_6_10To1_8 extends BackwardsProtocol<ClientboundPackets1_8, ClientboundPackets1_7_2_5, ServerboundPackets1_8, ServerboundPackets1_7_2_5> {
47+
public class Protocol1_8To1_7_6_10 extends BackwardsProtocol<ClientboundPackets1_8, ClientboundPackets1_7_2_5, ServerboundPackets1_8, ServerboundPackets1_7_2_5> {
4848

4949
public static final RewindMappings MAPPINGS = new RewindMappings("1.8", "1.7.10");
5050

5151
private final BlockItemPackets1_8 itemRewriter = new BlockItemPackets1_8(this);
5252
private final MetadataRewriter1_7_6_10To1_8 metadataRewriter = new MetadataRewriter1_7_6_10To1_8(this);
5353

54-
public Protocol1_7_6_10To1_8() {
54+
public Protocol1_8To1_7_6_10() {
5555
super(ClientboundPackets1_8.class, ClientboundPackets1_7_2_5.class, ServerboundPackets1_8.class, ServerboundPackets1_7_2_5.class);
5656
}
5757

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/data/ParticleIndex1_7_6_10.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/ParticleIndex1_7_6_10.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.data;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
1919

2020
import java.util.HashMap;
2121

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/data/VirtualHologramEntity.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/data/VirtualHologramEntity.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.data;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data;
1919

20-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
21-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
22-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetaIndex;
20+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.ClientboundPackets1_7_2_5;
21+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
22+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.metadata.MetaIndex;
2323
import com.viaversion.viarewind.api.type.Types1_7_6_10;
2424
import com.viaversion.viarewind.api.type.metadata.MetaType1_7_6_10;
25-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata.MetadataRewriter1_7_6_10To1_8;
25+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.metadata.MetadataRewriter1_7_6_10To1_8;
2626
import com.viaversion.viarewind.utils.math.AABB;
2727
import com.viaversion.viarewind.utils.math.Vector3d;
2828
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -144,14 +144,14 @@ private void updateLocation(final boolean remount) throws Exception {
144144
entityHeadLook.write(Type.INT, entityId);
145145
entityHeadLook.write(Type.BYTE, (byte) ((headYaw / 360f) * 256));
146146

147-
entityHeadLook.send(Protocol1_7_6_10To1_8.class);
147+
entityHeadLook.send(Protocol1_8To1_7_6_10.class);
148148
} else if (currentState == State.HOLOGRAM) {
149149
if (remount) {
150150
PacketWrapper detach = PacketWrapper.create(ClientboundPackets1_7_2_5.ATTACH_ENTITY, user);
151151
detach.write(Type.INT, entityIds[1]);
152152
detach.write(Type.INT, -1);
153153
detach.write(Type.BOOLEAN, false);
154-
detach.send(Protocol1_7_6_10To1_8.class);
154+
detach.send(Protocol1_8To1_7_6_10.class);
155155
}
156156

157157
// Don't ask me where this offset is coming from
@@ -164,7 +164,7 @@ private void updateLocation(final boolean remount) throws Exception {
164164
attach.write(Type.INT, entityIds[1]);
165165
attach.write(Type.INT, entityIds[0]);
166166
attach.write(Type.BOOLEAN, false);
167-
attach.send(Protocol1_7_6_10To1_8.class);
167+
attach.send(Protocol1_8To1_7_6_10.class);
168168
}
169169
}
170170
}
@@ -179,7 +179,7 @@ protected void teleportEntity(final int entityId, final double x, final double y
179179
entityTeleport.write(Type.BYTE, (byte) ((yaw / 360f) * 256)); // yaw
180180
entityTeleport.write(Type.BYTE, (byte) ((pitch / 360f) * 256)); // pitch
181181

182-
entityTeleport.send(Protocol1_7_6_10To1_8.class);
182+
entityTeleport.send(Protocol1_8To1_7_6_10.class);
183183
}
184184

185185
protected void spawnEntity(final int entityId, final int type, final double locX, final double locY, final double locZ) throws Exception {
@@ -198,7 +198,7 @@ protected void spawnEntity(final int entityId, final int type, final double locX
198198
spawnMob.write(Type.SHORT, (short) 0); // velocity z
199199
spawnMob.write(Types1_7_6_10.METADATA_LIST, new ArrayList<>()); // metadata
200200

201-
spawnMob.send(Protocol1_7_6_10To1_8.class);
201+
spawnMob.send(Protocol1_8To1_7_6_10.class);
202202
}
203203

204204
public void sendMetadataUpdate(final MetadataRewriter1_7_6_10To1_8 entityRewriter) throws Exception {
@@ -214,7 +214,7 @@ public void sendMetadataUpdate(final MetadataRewriter1_7_6_10To1_8 entityRewrite
214214
} else {
215215
return;
216216
}
217-
metadataPacket.send(Protocol1_7_6_10To1_8.class);
217+
metadataPacket.send(Protocol1_8To1_7_6_10.class);
218218
}
219219

220220
private void writeZombieMeta(final MetadataRewriter1_7_6_10To1_8 entityRewriter, PacketWrapper wrapper) {
@@ -282,7 +282,7 @@ public void sendSpawnPacket(final MetadataRewriter1_7_6_10To1_8 entityRewriter)
282282
spawnSkull.write(Type.BYTE, (byte) 0);
283283
spawnSkull.write(Type.BYTE, (byte) 0);
284284
spawnSkull.write(Type.INT, 0);
285-
spawnSkull.send(Protocol1_7_6_10To1_8.class);
285+
spawnSkull.send(Protocol1_8To1_7_6_10.class);
286286

287287
spawnEntity(entityIds[1], 100, locX, locY, locZ); // Horse
288288

@@ -317,7 +317,7 @@ public void deleteEntity() throws Exception {
317317
despawn.write(Type.INT, id);
318318
}
319319
entityIds = null;
320-
despawn.send(Protocol1_7_6_10To1_8.class);
320+
despawn.send(Protocol1_8To1_7_6_10.class);
321321
}
322322

323323
private enum State {

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/metadata/MetaIndex.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/metadata/MetaIndex.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.metadata;
1919

2020
import com.viaversion.viarewind.api.type.metadata.MetaType1_7_6_10;
2121
import com.viaversion.viaversion.api.minecraft.entities.EntityType;

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/metadata/MetadataRewriter1_7_6_10To1_8.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/metadata/MetadataRewriter1_7_6_10To1_8.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.metadata;
1919

2020
import com.google.common.collect.Lists;
2121
import com.google.common.primitives.Ints;
2222
import com.viaversion.viarewind.ViaRewind;
2323
import com.viaversion.viarewind.api.rewriter.VREntityRewriter;
2424
import com.viaversion.viarewind.api.type.Types1_7_6_10;
2525
import com.viaversion.viarewind.api.type.metadata.MetaType1_7_6_10;
26-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ClientboundPackets1_7_2_5;
27-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
28-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.data.VirtualHologramEntity;
29-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.EntityTracker1_8;
30-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
31-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.Scoreboard;
26+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.ClientboundPackets1_7_2_5;
27+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
28+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.data.VirtualHologramEntity;
29+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
30+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.GameProfileStorage;
31+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.Scoreboard;
3232
import com.viaversion.viaversion.api.Via;
3333
import com.viaversion.viaversion.api.minecraft.ClientWorld;
3434
import com.viaversion.viaversion.api.minecraft.Position;
@@ -49,9 +49,9 @@
4949
import java.util.UUID;
5050
import java.util.logging.Level;
5151

52-
public class MetadataRewriter1_7_6_10To1_8 extends VREntityRewriter<ClientboundPackets1_8, Protocol1_7_6_10To1_8> {
52+
public class MetadataRewriter1_7_6_10To1_8 extends VREntityRewriter<ClientboundPackets1_8, Protocol1_8To1_7_6_10> {
5353

54-
public MetadataRewriter1_7_6_10To1_8(Protocol1_7_6_10To1_8 protocol) {
54+
public MetadataRewriter1_7_6_10To1_8(Protocol1_8To1_7_6_10 protocol) {
5555
super(protocol, MetaType1_7_6_10.String, MetaType1_7_6_10.Byte);
5656
}
5757

@@ -78,7 +78,7 @@ public void register() {
7878
}
7979
}
8080

81-
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_7_6_10To1_8.class);
81+
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
8282
tracker.addPlayer(entityId, wrapper.user().getProtocolInfo().getUuid());
8383
tracker.setClientEntityGameMode(wrapper.get(Type.UNSIGNED_BYTE, 0));
8484

@@ -101,7 +101,7 @@ public void register() {
101101
for (List<Integer> part : parts) {
102102
final PacketWrapper destroy = PacketWrapper.create(ClientboundPackets1_7_2_5.DESTROY_ENTITIES, wrapper.user());
103103
destroy.write(Types1_7_6_10.BYTE_INT_ARRAY, part.stream().mapToInt(Integer::intValue).toArray());
104-
destroy.scheduleSend(Protocol1_7_6_10To1_8.class);
104+
destroy.scheduleSend(Protocol1_8To1_7_6_10.class);
105105
}
106106
});
107107
protocol.registerClientbound(ClientboundPackets1_8.ENTITY_METADATA, new PacketHandlers() {
@@ -265,7 +265,7 @@ public void register() {
265265
final byte pitch = wrapper.get(Type.BYTE, 1);
266266
final byte yaw = wrapper.get(Type.BYTE, 0);
267267
final byte headYaw = wrapper.get(Type.BYTE, 2);
268-
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_7_6_10To1_8.class);
268+
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
269269
final VirtualHologramEntity hologram = tracker.getHolograms().get(entityId);
270270

271271
hologram.setPosition(x / 32.0, y / 32.0, z / 32.0);
@@ -303,15 +303,15 @@ public void register() {
303303

304304
final int entityId = wrapper.get(Type.VAR_INT, 0);
305305

306-
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_7_6_10To1_8.class);
306+
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
307307
if (gameProfile != null && gameProfile.gamemode == 3) { // Spectator mode
308308
for (short i = 0; i < 5; i++) {
309309
final PacketWrapper entityEquipment = PacketWrapper.create(ClientboundPackets1_7_2_5.ENTITY_EQUIPMENT, wrapper.user());
310310
entityEquipment.write(Type.INT, entityId);
311311
entityEquipment.write(Type.SHORT, i);
312312
entityEquipment.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, i == 4 ? gameProfile.getSkull() : null);
313313

314-
entityEquipment.scheduleSend(Protocol1_7_6_10To1_8.class);
314+
entityEquipment.scheduleSend(Protocol1_8To1_7_6_10.class);
315315
}
316316
}
317317

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/BlockItemPackets1_8.java renamed to common/src/main/java/com/viaversion/viarewind/protocol/v1_8to1_7_6_10/packets/BlockItemPackets1_8.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
* You should have received a copy of the GNU General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.packets;
18+
package com.viaversion.viarewind.protocol.v1_8to1_7_6_10.packets;
1919

2020
import com.viaversion.viabackwards.api.rewriters.LegacyEnchantmentRewriter;
2121
import com.viaversion.viarewind.api.rewriter.VRBlockItemRewriter;
22-
import com.viaversion.viarewind.protocol.protocol1_7_2_5to1_7_6_10.ServerboundPackets1_7_2_5;
23-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
24-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.EntityTracker1_8;
25-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
26-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.InventoryTracker;
27-
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.PlayerSessionStorage;
22+
import com.viaversion.viarewind.protocol.v1_7_6_10to1_7_2_5.ServerboundPackets1_7_2_5;
23+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.Protocol1_8To1_7_6_10;
24+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.EntityTracker1_8;
25+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.GameProfileStorage;
26+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.InventoryTracker;
27+
import com.viaversion.viarewind.protocol.v1_8to1_7_6_10.storage.PlayerSessionStorage;
2828
import com.viaversion.viarewind.api.type.Types1_7_6_10;
2929
import com.viaversion.viarewind.utils.ChatUtil;
3030
import com.viaversion.viaversion.api.connection.UserConnection;
@@ -37,11 +37,11 @@
3737

3838
import java.util.UUID;
3939

40-
public class BlockItemPackets1_8 extends VRBlockItemRewriter<ClientboundPackets1_8, ServerboundPackets1_7_2_5, Protocol1_7_6_10To1_8> {
40+
public class BlockItemPackets1_8 extends VRBlockItemRewriter<ClientboundPackets1_8, ServerboundPackets1_7_2_5, Protocol1_8To1_7_6_10> {
4141

4242
private LegacyEnchantmentRewriter enchantmentRewriter;
4343

44-
public BlockItemPackets1_8(Protocol1_7_6_10To1_8 protocol) {
44+
public BlockItemPackets1_8(Protocol1_8To1_7_6_10 protocol) {
4545
super(protocol, "1.8");
4646
}
4747

@@ -117,7 +117,7 @@ public void register() {
117117
final Item item = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM, 0);
118118
playerSession.setPlayerEquipment(wrapper.user().getProtocolInfo().getUuid(), item, 8 - slot);
119119

120-
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_7_6_10To1_8.class);
120+
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
121121
if (tracker.isSpectator()) { // Spectator mode didn't exist in 1.7.10
122122
wrapper.cancel();
123123
}
@@ -151,7 +151,7 @@ public void register() {
151151
final short windowId = wrapper.get(Type.UNSIGNED_BYTE, 0);
152152
if (windowId != 0) return;
153153

154-
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_7_6_10To1_8.class);
154+
final EntityTracker1_8 tracker = wrapper.user().getEntityTracker(Protocol1_8To1_7_6_10.class);
155155
final UUID userId = wrapper.user().getProtocolInfo().getUuid();
156156

157157
final Item[] items = wrapper.get(Types1_7_6_10.COMPRESSED_NBT_ITEM_ARRAY, 0);

0 commit comments

Comments
 (0)