anygatecloud/minecraft-data-generator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small improvements (#22)

Browse Source 
* Remove sky color hardcoding

* Bind to available port instead of 25565

* Fix error class and reduce accessors

* Fix language errors

* Cleanup imports and remove weird behaviour

* Print properly message

* Print version name

* Bump gson, update API usage and use linkedhashset over list

* Reimplement approach to categories

* Enable all feature flags by default

* Use jul instead of slf4j

* Call mc repo before maven central to fix build on mac
This commit is contained in:
Alex
2024-10-27 10:55:58 +01:00
committed by GitHub
parent 1c4802d97e
commit 131218ce79
124 changed files with 639 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
1.15/build.gradle
+6
View File
@@ -45,3 +45,9 @@ tasks.withType(RemapJarTask).configureEach {
tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
}
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}
1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
+1 -83
View File
@@ -19,88 +19,6 @@ public class BiomesDataGenerator implements IDataGenerator {
};
}
private static int getBiomeColorFor(String biomeName) {
return switch (biomeName) {
case "ocean" -> 112;
case "plains" -> 9286496;
case "desert" -> 16421912;
case "mountains" -> 6316128;
case "forest" -> 353825;
case "taiga" -> 747097;
case "swamp" -> 522674;
case "river" -> 255;
case "nether_wastes" -> 12532539;
case "the_end" -> 8421631;
case "frozen_ocean" -> 7368918;
case "frozen_river" -> 10526975;
case "snowy_tundra" -> 16777215;
case "snowy_mountains" -> 10526880;
case "mushroom_fields" -> 16711935;
case "mushroom_field_shore" -> 10486015;
case "beach" -> 16440917;
case "desert_hills" -> 13786898;
case "wooded_hills" -> 2250012;
case "taiga_hills" -> 1456435;
case "mountain_edge" -> 7501978;
case "jungle" -> 5470985;
case "jungle_hills" -> 2900485;
case "jungle_edge" -> 6458135;
case "deep_ocean" -> 48;
case "stone_shore" -> 10658436;
case "snowy_beach" -> 16445632;
case "birch_forest" -> 3175492;
case "birch_forest_hills" -> 2055986;
case "dark_forest" -> 4215066;
case "snowy_taiga" -> 3233098;
case "snowy_taiga_hills" -> 2375478;
case "giant_tree_taiga" -> 5858897;
case "giant_tree_taiga_hills" -> 4542270;
case "wooded_mountains" -> 5271632;
case "savanna" -> 12431967;
case "savanna_plateau" -> 10984804;
case "badlands" -> 14238997;
case "wooded_badlands_plateau" -> 11573093;
case "badlands_plateau" -> 13274213;
case "small_end_islands" -> 42;
case "end_midlands" -> 15464630;
case "end_highlands" -> 12828041;
case "end_barrens" -> 9474162;
case "warm_ocean" -> 172;
case "lukewarm_ocean" -> 144;
case "cold_ocean" -> 2105456;
case "deep_warm_ocean" -> 80;
case "deep_lukewarm_ocean" -> 64;
case "deep_cold_ocean" -> 2105400;
case "deep_frozen_ocean" -> 4210832;
case "the_void" -> 0;
case "sunflower_plains" -> 11918216;
case "desert_lakes" -> 16759872;
case "gravelly_mountains" -> 8947848;
case "flower_forest" -> 2985545;
case "taiga_mountains" -> 3378817;
case "swamp_hills" -> 3145690;
case "ice_spikes" -> 11853020;
case "modified_jungle" -> 8102705;
case "modified_jungle_edge" -> 9089855;
case "tall_birch_forest" -> 5807212;
case "tall_birch_hills" -> 4687706;
case "dark_forest_hills" -> 6846786;
case "snowy_taiga_mountains" -> 5864818;
case "giant_spruce_taiga" -> 8490617;
case "giant_spruce_taiga_hills" -> 7173990;
case "modified_gravelly_mountains" -> 7903352;
case "shattered_savanna" -> 15063687;
case "shattered_savanna_plateau" -> 13616524;
case "eroded_badlands" -> 16739645;
case "modified_wooded_badlands_plateau" -> 14204813;
case "modified_badlands_plateau" -> 15905933;
case "bamboo_jungle" -> 7769620;
case "bamboo_jungle_hills" -> 3884810;
case "nether" -> 16711680;
default -> throw new Error("Unexpected biome, with name: '" + biomeName + "'");
};
}
public static JsonObject generateBiomeInfo(Registry<Biome> registry, Biome biome) {
JsonObject biomeDesc = new JsonObject();
Identifier registryKey = registry.getId(biome);
@@ -114,7 +32,7 @@ public class BiomesDataGenerator implements IDataGenerator {
biomeDesc.addProperty("depth", biome.getDepth());
biomeDesc.addProperty("dimension", guessBiomeDimensionFromCategory(biome));
biomeDesc.addProperty("displayName", DGU.translateText(localizationKey));
biomeDesc.addProperty("color", getBiomeColorFor(registryKey.getPath()));
biomeDesc.addProperty("color", biome.getSkyColor());
biomeDesc.addProperty("rainfall", biome.getRainfall());
return biomeDesc;
1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+3 -4
View File
@@ -33,9 +33,8 @@ public class EntitiesDataGenerator implements IDataGenerator {
entityDesc.addProperty("width", entityType.getDimensions().width);
entityDesc.addProperty("height", entityType.getDimensions().height);
String entityTypeString = "UNKNOWN";
Entity entityObject = entityType.create(DGU.getWorld());
entityTypeString = entityObject != null ? getEntityTypeForClass(entityObject.getClass()) : "player";
String entityTypeString = entityObject != null ? getEntityTypeForClass(entityObject.getClass()) : "player";
entityDesc.addProperty("type", entityTypeString);
entityDesc.addProperty("category", getCategoryFrom(entityType));
@@ -46,7 +45,7 @@ public class EntitiesDataGenerator implements IDataGenerator {
if (entityType == EntityType.PLAYER) return "other"; // fail early for player entities
Entity entity = entityType.create(DGU.getWorld());
if (entity == null)
throw new Error("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey()));
throw new IllegalStateException("Entity was null after trying to create a: " + DGU.translateText(entityType.getTranslationKey()));
entity.remove();
return switch (entity.getClass().getPackageName()) {
case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
@@ -57,7 +56,7 @@ public class EntitiesDataGenerator implements IDataGenerator {
case "net.minecraft.entity.passive" -> "Passive mobs";
case "net.minecraft.entity.vehicle" -> "Vehicles";
case "net.minecraft.entity" -> "other";
default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName());
default -> throw new IllegalStateException("Unexpected entity type: " + entity.getClass().getPackageName());
};
}
1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java
+8 -12
View File
@@ -9,9 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
public class ItemsDataGenerator implements IDataGenerator {
@@ -23,10 +21,12 @@ public class ItemsDataGenerator implements IDataGenerator {
.collect(Collectors.toList());
}
private static List<EnchantmentTarget> getApplicableEnchantmentTargets(Item sourceItem) {
private static Set<String> getApplicableEnchantmentTargets(Item sourceItem) {
return Arrays.stream(EnchantmentTarget.values())
.filter(target -> target.isAcceptableItem(sourceItem))
.collect(Collectors.toList());
.map(EnchantmentsDataGenerator::getEnchantmentTargetName)
.sorted()
.collect(Collectors.toCollection(LinkedHashSet::new));
}
public static JsonObject generateItem(Registry<Item> itemRegistry, Item item) {
@@ -39,13 +39,9 @@ public class ItemsDataGenerator implements IDataGenerator {
itemDesc.addProperty("displayName", DGU.translateText(item.getTranslationKey()));
itemDesc.addProperty("stackSize", item.getMaxCount());
List<EnchantmentTarget> enchantmentTargets = getApplicableEnchantmentTargets(item);
JsonArray enchantCategoriesArray = new JsonArray();
for (EnchantmentTarget target : enchantmentTargets) {
enchantCategoriesArray.add(EnchantmentsDataGenerator.getEnchantmentTargetName(target));
}
if (enchantCategoriesArray.size() > 0) {
getApplicableEnchantmentTargets(item).forEach(enchantCategoriesArray::add);
if (!enchantCategoriesArray.isEmpty()) {
itemDesc.add("enchantCategories", enchantCategoriesArray);
}
@@ -57,7 +53,7 @@ public class ItemsDataGenerator implements IDataGenerator {
Identifier repairWithName = itemRegistry.getId(repairWithItem);
fixedWithArray.add(Objects.requireNonNull(repairWithName).getPath());
}
if (fixedWithArray.size() > 0) {
if (!fixedWithArray.isEmpty()) {
itemDesc.add("repairWith", fixedWithArray);
}
1.15/src/main/java/dev/u9g/minecraftdatagenerator/generators/LanguageDataGenerator.java
+2 -2
View File
@@ -20,8 +20,8 @@ public class LanguageDataGenerator implements IDataGenerator {
try {
InputStream inputStream = Objects.requireNonNull(this.getClass().getResourceAsStream("/assets/minecraft/lang/en_us.json"));
return new Gson().fromJson(new InputStreamReader(inputStream, StandardCharsets.UTF_8), JsonObject.class);
} catch (Exception ignored) {
} catch (Exception e) {
throw new RuntimeException("Failed to generate language file", e);
}
throw new RuntimeException("Failed to generate language file");
}
}
1.15/src/main/java/dev/u9g/minecraftdatagenerator/mixin/ReadyMixin.java
+5
View File
@@ -11,6 +11,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(MinecraftDedicatedServer.class)
public class ReadyMixin {
@Inject(method = "setupServer()Z", at = @At("HEAD"))
private void constructor(CallbackInfoReturnable<Boolean> cir) {
((MinecraftDedicatedServer) (Object) this).setServerPort(0);
}
@Inject(method = "setupServer()Z", at = @At("TAIL"))
private void init(CallbackInfoReturnable<Boolean> cir) {
MinecraftDataGenerator.start(