Skip to content

Fix double-applied +1 offset in sound IDs (SoundsDataGenerator) #76

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
arielvino wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix double-applied +1 offset in sound IDs (SoundsDataGenerator) #76

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
5 changes: 4 additions & 1 deletion mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", Registry.SOUND_EVENT.getRawId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.getId().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.getId().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.id().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", BuiltInRegistries.SOUND_EVENT.getId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.location().getPath());

return soundDesc;
Expand Down
5 changes: 4 additions & 1 deletion mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public class SoundsDataGenerator implements IDataGenerator {
public static JsonObject generateSound(SoundEvent soundEvent) {
JsonObject soundDesc = new JsonObject();

soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent) + 1); // the plus 1 is required for 1.19.2+ due to Mojang using 0 in the packet to say that you should read a string id instead.
soundDesc.addProperty("id", Registries.SOUND_EVENT.getRawId(soundEvent)); // raw 0-indexed sound_event registry id. The wire packet encodes (id + 1),
// with 0 meaning "read an inline SoundEvent instead" — but that offset is applied by
// the packet codec (registryEntryHolder), NOT here. Adding it to the registry dump
// double-counts and shifts every consumer's sound lookup by one.
soundDesc.addProperty("name", soundEvent.getId().getPath());

return soundDesc;
Expand Down
Loading