Skip to content

Map splash potion IDs in 1.9->1.8 level event #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roccodev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Map splash potion IDs in 1.9->1.8 level event #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions ...n/src/main/java/com/viaversion/viarewind/protocol/v1_9to1_8/data/PotionIdMappings1_8.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
*/
package com.viaversion.viarewind.protocol.v1_9to1_8.data;

import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
import com.viaversion.viaversion.protocols.v1_8to1_9.data.PotionIdMappings1_9;
import java.util.HashMap;
import java.util.Map;

public class PotionIdMappings1_8 {
public static final Map<String, String> POTION_NAME_INDEX = new HashMap<>();
public static final Map<String, Integer> POTION_NAME_TO_ID = new HashMap<>();
public static final Int2ObjectMap<String> SPLASH_MAPPINGS = new Int2ObjectOpenHashMap<>();

static {
POTION_NAME_TO_ID.putAll(PotionIdMappings1_9.POTION_NAME_TO_ID);
Expand Down Expand Up @@ -75,5 +78,28 @@ public class PotionIdMappings1_8 {
POTION_NAME_INDEX.put("luck_lingering", "§rLingering Potion of Luck");
POTION_NAME_INDEX.put("luck", "§rPotion of Luck");
POTION_NAME_INDEX.put("luck_splash", "§rSplash Potion of Luck");

SPLASH_MAPPINGS.put(5, "night_vision");
SPLASH_MAPPINGS.put(7, "invisibility");
SPLASH_MAPPINGS.put(9, "leaping");
SPLASH_MAPPINGS.put(12, "fire_resistance");
SPLASH_MAPPINGS.put(14, "swiftness");
SPLASH_MAPPINGS.put(17, "slowness");
SPLASH_MAPPINGS.put(19, "water_breathing");
SPLASH_MAPPINGS.put(21, "healing");
SPLASH_MAPPINGS.put(23, "harming");
SPLASH_MAPPINGS.put(25, "poison");
SPLASH_MAPPINGS.put(28, "regeneration");
SPLASH_MAPPINGS.put(31, "strength");
SPLASH_MAPPINGS.put(34, "weakness");
SPLASH_MAPPINGS.put(36, "luck");
}

public static int getIdForSplash(int id1_9) {
final String key = SPLASH_MAPPINGS.get(id1_9);
if (key == null) {
return -1;
}
return POTION_NAME_TO_ID.getOrDefault(key, -1);
}
}
6 changes: 6 additions & 0 deletions ...ain/java/com/viaversion/viarewind/protocol/v1_9to1_8/rewriter/WorldPacketRewriter1_9.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.viaversion.viarewind.protocol.v1_9to1_8.Protocol1_9To1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.data.CommandBlockState;
import com.viaversion.viarewind.protocol.v1_9to1_8.data.EffectIdMappings1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.data.PotionIdMappings1_8;
import com.viaversion.viarewind.protocol.v1_9to1_8.storage.CommandBlockStateStorage;
import com.viaversion.viaversion.api.minecraft.BlockPosition;
import com.viaversion.viaversion.api.minecraft.Environment;
Expand Down Expand Up @@ -237,6 +238,11 @@ public void register() {
if (id == 2001) {
int replacedBlock = protocol.getItemRewriter().handleBlockId(wrapper.get(Types.INT, 1));
wrapper.set(Types.INT, 1, replacedBlock);
} else if (id == 2002) {
final int mappedSplash = PotionIdMappings1_8.getIdForSplash(wrapper.get(Types.INT, 1));
if (mappedSplash != -1) {
wrapper.set(Types.INT, 1, mappedSplash);
}
}
});
}
Expand Down