Skip to content

Commit 26b9a83

Browse files
Fixed api usages
1 parent 37a671d commit 26b9a83

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/metadata/MetaIndex1_7_6_10To1_8.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.metadata;
2020

2121
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
22+
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
2223
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
2324
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
2425
import com.viaversion.viaversion.util.Pair;
@@ -139,8 +140,8 @@ public enum MetaIndex1_7_6_10To1_8 {
139140
this.newType = newType;
140141
}
141142

142-
private static Optional<MetaIndex1_7_6_10To1_8> getIndex(EntityTypes1_10.EntityType type, int index) {
143-
Pair<EntityTypes1_10.EntityType, Integer> pair = new Pair<>(type, index);
143+
private static Optional<MetaIndex1_7_6_10To1_8> getIndex(EntityType type, int index) {
144+
Pair<EntityType, Integer> pair = new Pair<>(type, index);
144145
if (metadataRewrites.containsKey(pair)) {
145146
return Optional.of(metadataRewrites.get(pair));
146147
}
@@ -168,8 +169,8 @@ public int getIndex() {
168169
return index;
169170
}
170171

171-
public static MetaIndex1_7_6_10To1_8 searchIndex(EntityTypes1_10.EntityType type, int index) {
172-
EntityTypes1_10.EntityType currentType = type;
172+
public static MetaIndex1_7_6_10To1_8 searchIndex(EntityType type, int index) {
173+
EntityType currentType = type;
173174
do {
174175
Optional<MetaIndex1_7_6_10To1_8> optMeta = getIndex(currentType, index);
175176

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/metadata/MetadataRewriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.viaversion.viarewind.ViaRewind;
2222
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.Protocol1_7_6_10To1_8;
2323
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.metadata.MetaType1_7_6_10;
24-
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
24+
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
2525
import com.viaversion.viaversion.api.minecraft.item.Item;
2626
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
2727
import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_8;
@@ -39,7 +39,7 @@ public MetadataRewriter(Protocol1_7_6_10To1_8 protocol) {
3939
this.protocol = protocol;
4040
}
4141

42-
public void transform(EntityTypes1_10.EntityType type, List<Metadata> list) {
42+
public void transform(EntityType type, List<Metadata> list) {
4343
for (Metadata entry : new ArrayList<>(list)) {
4444
final MetaIndex1_7_6_10To1_8 metaIndex = MetaIndex1_7_6_10To1_8.searchIndex(type, entry.id());
4545
try {

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/EntityPackets.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.GameProfileStorage;
2525
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.storage.PlayerSessionStorage;
2626
import com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.Types1_7_6_10;
27+
import com.viaversion.viaversion.api.minecraft.entities.EntityType;
2728
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_10;
2829
import com.viaversion.viaversion.api.minecraft.item.Item;
2930
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
@@ -213,7 +214,7 @@ public void register() {
213214
final EntityTracker1_7_6_10 tracker = wrapper.user().get(EntityTracker1_7_6_10.class);
214215

215216
final int entityId = wrapper.get(Type.INT, 0);
216-
final EntityTypes1_10.EntityType type = tracker.getEntityMap().get(entityId);
217+
final EntityType type = tracker.getEntityMap().get(entityId);
217218

218219
if (type == EntityTypes1_10.EntityType.MINECART_ABSTRACT) { // TODO | Realign all entities?
219220
int y = wrapper.get(Type.INT, 2);

0 commit comments

Comments
 (0)