diff --git a/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index 53afb138..408aac41 100644 --- a/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.19.2/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index e3906559..bd21f5f4 100644 --- a/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.20/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.10/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.11/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index eb069674..d2e57f90 100644 --- a/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.3/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.5/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.6/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.7/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.8/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index d18ed157..a1f57dc6 100644 --- a/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21.9/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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; diff --git a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java index e3906559..bd21f5f4 100644 --- a/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java +++ b/mc/1.21/src/main/java/dev/u9g/minecraftdatagenerator/generators/SoundsDataGenerator.java @@ -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;