Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-27 12:38:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1185 from creeper123123321/fixparticleandtranslations

Browse Source 
Fix particles and translations with %d
This commit is contained in:
Myles 2019-02-06 20:54:26 +00:00 committed by GitHub
commit 7534904737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/MetadataRewriter.java
View File

@ -98,7 +98,9 @@ public class MetadataRewriter {
// Handle AreaEffectCloud outside the loop // Handle AreaEffectCloud outside the loop
if (type != null && type.is(Entity1_13Types.EntityType.AREA_EFFECT_CLOUD) && particleId != -1) { if (type != null && type.is(Entity1_13Types.EntityType.AREA_EFFECT_CLOUD) && particleId != -1) {
Particle particle = ParticleRewriter.rewriteParticle(particleId, new Integer[]{parameter1, parameter2}); Particle particle = ParticleRewriter.rewriteParticle(particleId, new Integer[]{parameter1, parameter2});
if (particle != null && particle.getId() != -1) {
metadatas.add(new Metadata(9, MetaType1_13.PARTICLE, particle)); metadatas.add(new Metadata(9, MetaType1_13.PARTICLE, particle));
} }
} }
} }
}

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/MappingData.java
View File

@ -67,7 +67,7 @@ public class MappingData {
String[] keyAndTranslation = line.split("=", 2); String[] keyAndTranslation = line.split("=", 2);
if (keyAndTranslation.length != 2) continue; if (keyAndTranslation.length != 2) continue;
String key = keyAndTranslation[0]; String key = keyAndTranslation[0];
String translation = keyAndTranslation[1]; String translation = keyAndTranslation[1].replaceAll("%(\\d\\$)?d", "%$1s");
if (!translateData.containsKey(key)) { if (!translateData.containsKey(key)) {
translateMapping.put(key, translation); translateMapping.put(key, translation);
} else { } else {

15
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java
View File

@ -11,11 +11,10 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.WorldPackets;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.concurrent.ThreadLocalRandom;
public class ParticleRewriter { public class ParticleRewriter {
private static List<NewParticle> particles = new LinkedList<>(); private static List<NewParticle> particles = new LinkedList<>();
private static Random rand = new Random();
static { static {
add(34); // (0->34) explode -> minecraft:poof add(34); // (0->34) explode -> minecraft:poof
@ -108,17 +107,17 @@ public class ParticleRewriter {
return new ParticleDataHandler() { return new ParticleDataHandler() {
@Override @Override
public Particle handler(Particle particle, Integer[] data) { public Particle handler(Particle particle, Integer[] data) {
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Red 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Red 0 - 1
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Green 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 0f)); // Green 0 - 1
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Blue 0 - 1 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Blue 0 - 1
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1));// Scale 0.01 - 4 particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1f));// Scale 0.01 - 4
return particle; return particle;
} }
}; };
} }
private static float randomFloat() { private static boolean randomBool() {
return rand.nextFloat(); return ThreadLocalRandom.current().nextBoolean();
} }
// Rewrite IconCrack items to new format :) // Rewrite IconCrack items to new format :)

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
View File

@ -615,7 +615,7 @@ public class InventoryPackets {
ench.add(enchEntry); ench.add(enchEntry);
} }
} }
tag.remove("Enchantment"); tag.remove("Enchantments");
tag.put(ench); tag.put(ench);
} }
if (tag.get("StoredEnchantments") instanceof ListTag) { if (tag.get("StoredEnchantments") instanceof ListTag) {

11
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java
View File

@ -415,15 +415,20 @@ public class WorldPackets {
if (particle.getId() == 11) { if (particle.getId() == 11) {
int count = wrapper.get(Type.INT, 1); int count = wrapper.get(Type.INT, 1);
float speed = wrapper.get(Type.FLOAT, 6); float speed = wrapper.get(Type.FLOAT, 6);
// Only handle for count = 0 & speed = 1 // Only handle for count = 0
if (count == 0 && speed == 1) { if (count == 0) {
wrapper.set(Type.INT, 1, 1); wrapper.set(Type.INT, 1, 1);
wrapper.set(Type.FLOAT, 6, 0f); wrapper.set(Type.FLOAT, 6, 0f);
List<Particle.ParticleData> arguments = particle.getArguments(); List<Particle.ParticleData> arguments = particle.getArguments();
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
//RGB values are represented by the X/Y/Z offset //RGB values are represented by the X/Y/Z offset
arguments.get(i).setValue(wrapper.get(Type.FLOAT, i + 3)); float colorValue = wrapper.get(Type.FLOAT, i + 3) * speed;
if (colorValue == 0 && i == 0) {
// https://minecraft.gamepedia.com/User:Alphappy/reddust
colorValue = 1;
}
arguments.get(i).setValue(colorValue);
wrapper.set(Type.FLOAT, i + 3, 0f); wrapper.set(Type.FLOAT, i + 3, 0f);
} }
} }