Merge remote-tracking branch 'upstream/new-data-preperation-1.17' into new-data-1.17

build.gradle

@@ -201,7 +201,7 @@ configurations.all {
 }
 
 processResources {
-    dependsOn("downloadResources")
+    dependsOn("copyData")
 }
 
 publishing {
@@ -218,4 +218,4 @@ publishing {
 task copyData(type: Copy) {
     from("MinestomDataGenerator/Minestom-Data/$mcVersion/")
     into(new File(project.projectDir, "/src/main/resources/minecraft_data/"))
-}
+}

code-generators/build.gradle

@@ -40,4 +40,4 @@ run {
             ]
     )
     dependsOn(project.rootProject.tasks.getByName("copyData"))
-}
+}

code-generators/src/main/java/net/minestom/codegen/Generators.java

@@ -23,75 +23,75 @@ public class Generators {
             LOGGER.error("Usage: <MC version> <source folder> <target folder>");
             return;
         }
-        String targetVersion = args[0];
+        String targetVersion = args[0].replace(".", "_");
         File inputFolder = new File(args[1]);
         File outputFolder = new File(args[2]);
         // Generate blocks
         new BlockGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_blocks.json"),
+                new File(inputFolder, targetVersion + "_blocks.json"),
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_block_properties.json"),
+                new File(inputFolder, targetVersion + "_block_properties.json"),
                 outputFolder
         ).generate();
         // Generate fluids
         new FluidGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_fluids.json"),
+                new File(inputFolder, targetVersion + "_fluids.json"),
                 outputFolder
         ).generate();
         // Generate entities
         new EntityTypeGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_entities.json"),
+                new File(inputFolder, targetVersion + "_entities.json"),
                 outputFolder
         ).generate();
         // Generate items
         new MaterialGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_items.json"),
+                new File(inputFolder, targetVersion + "_items.json"),
                 outputFolder
         ).generate();
         // Generate enchantments
         new EnchantmentGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_enchantments.json"),
+                new File(inputFolder, targetVersion + "_enchantments.json"),
                 outputFolder
         ).generate();
         // TODO: Generate attributes
 //        new AttributeGenerator(
-//                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_attributes.json"),
+//                new File(inputFolder, targetVersion + "_attributes.json"),
 //                outputFolder
 //        ).generate();
         // Generate potion effects
         new PotionEffectGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_potion_effects.json"),
+                new File(inputFolder, targetVersion + "_potion_effects.json"),
                 outputFolder
         ).generate();
         // Generate potions
         new PotionTypeGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_potions.json"),
+                new File(inputFolder, targetVersion + "_potions.json"),
                 outputFolder
         ).generate();
         // Generate particles
         new ParticleGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_particles.json"),
+                new File(inputFolder, targetVersion + "_particles.json"),
                 outputFolder
         ).generate();
         // Generate sounds
         new SoundEventGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_sounds.json"),
+                new File(inputFolder, targetVersion + "_sounds.json"),
                 outputFolder
         ).generate();
         // TODO: Generate villager professions
 //        new VillagerProfessionGenerator(
-//                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_villager_professions.json"),
+//                new File(inputFolder, targetVersion + "_villager_professions.json"),
 //                outputFolder
 //        ).generate();
         // TODO: Generate villager types
 //        new VillagerTypeGenerator(
-//                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_villager_types.json"),
+//                new File(inputFolder, targetVersion + "_villager_types.json"),
 //                outputFolder
 //        ).generate();
         // Generate statistics
         new StatisticGenerator(
-                new File(inputFolder, targetVersion.replaceAll("\\.", "_") + "_custom_statistics.json"),
+                new File(inputFolder, targetVersion + "_custom_statistics.json"),
                 outputFolder
         ).generate();
         LOGGER.info("Finished generating code");
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/MinestomCodeGenerator.java

@@ -26,4 +26,4 @@ public abstract class MinestomCodeGenerator {
             }
         }
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/attribute/AttributeGenerator.java

@@ -1,6 +1,8 @@
 package net.minestom.codegen.attribute;
 
-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import com.squareup.javapoet.*;
 import net.minestom.codegen.MinestomCodeGenerator;
@@ -135,13 +137,13 @@ public final class AttributeGenerator extends MinestomCodeGenerator {
         // toString method
         attributeClass.addMethod(
                 MethodSpec.methodBuilder("toString")
-                .addAnnotation(NotNull.class)
+                        .addAnnotation(NotNull.class)
-                .addAnnotation(Override.class)
+                        .addAnnotation(Override.class)
-                .returns(String.class)
+                        .returns(String.class)
                         // this resolves to [Namespace]
-                .addStatement("return \"[\" + this.id + \"]\"")
+                        .addStatement("return \"[\" + this.id + \"]\"")
-                .addModifiers(Modifier.PUBLIC)
+                        .addModifiers(Modifier.PUBLIC)
-                .build()
+                        .build()
         );
         // Creating ClampedAttribute
         ClassName clampedAttributeClassName = ClassName.get("net.minestom.server.attribute", "ClampedAttribute");
@@ -251,4 +253,4 @@ public final class AttributeGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/blocks/BlockGenerator.java

@@ -412,4 +412,4 @@ public final class BlockGenerator extends MinestomCodeGenerator {
         // Write files to outputFolder
         writeFiles(filesToWrite, outputFolder);
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/entity/EntityTypeGenerator.java

@@ -442,4 +442,4 @@ public final class EntityTypeGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/entity/VillagerProfessionGenerator.java

@@ -1,6 +1,8 @@
 package net.minestom.codegen.entity;
 
-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import com.squareup.javapoet.*;
 import net.minestom.codegen.MinestomCodeGenerator;
@@ -216,4 +218,4 @@ public final class VillagerProfessionGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/entity/VillagerTypeGenerator.java

@@ -1,6 +1,8 @@
 package net.minestom.codegen.entity;
 
-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import com.squareup.javapoet.*;
 import net.minestom.codegen.MinestomCodeGenerator;
@@ -168,4 +170,4 @@ public final class VillagerTypeGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/fluid/FluidGenerator.java

@@ -136,9 +136,9 @@ public final class FluidGenerator extends MinestomCodeGenerator {
             String fluidName = fluid.get("name").getAsString();
 
             fluidClass.addEnumConstant(fluidName, TypeSpec.anonymousClassBuilder(
-                            "$T.from($S)",
+                    "$T.from($S)",
-                            namespaceIDClassName,
+                    namespaceIDClassName,
-                            fluid.get("id").getAsString()
+                    fluid.get("id").getAsString()
                     ).build()
             );
         }
@@ -154,4 +154,4 @@ public final class FluidGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/item/EnchantmentGenerator.java

@@ -153,4 +153,4 @@ public final class EnchantmentGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/item/MaterialGenerator.java

@@ -284,7 +284,7 @@ public final class MaterialGenerator extends MinestomCodeGenerator {
                                 .build()
                 );
                 if (ap.get("slot") != null) {
-                    switch(ap.get("slot").getAsString()) {
+                    switch (ap.get("slot").getAsString()) {
                         case "head": {
                             enumConst.addMethod(
                                     MethodSpec.methodBuilder("isHelmet")
@@ -348,4 +348,4 @@ public final class MaterialGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/particle/ParticleGenerator.java

@@ -152,4 +152,4 @@ public final class ParticleGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/potion/PotionEffectGenerator.java

@@ -153,4 +153,4 @@ public final class PotionEffectGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/potion/PotionTypeGenerator.java

@@ -153,4 +153,4 @@ public final class PotionTypeGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/sound/SoundEventGenerator.java

@@ -152,4 +152,4 @@ public final class SoundEventGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/statistics/StatisticGenerator.java

@@ -153,4 +153,4 @@ public final class StatisticGenerator extends MinestomCodeGenerator {
                 outputFolder
         );
     }
-}
+}

code-generators/src/main/java/net/minestom/codegen/util/NameUtil.java

@@ -18,4 +18,4 @@ public final class NameUtil {
         sb.setCharAt(0, Character.toUpperCase(sb.charAt(0)));
         return sb.toString();
     }
-}
+}