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.18/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.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/BiomesDataGenerator.java
+1 -68
View File
@@ -18,73 +18,6 @@ public class BiomesDataGenerator implements IDataGenerator {
};
}
private static int getBiomeColorFor(String biomeName) {
return switch (biomeName) {
case "the_void" -> 0;
case "plains" -> 9286496;
case "sunflower_plains" -> 11918216;
case "snowy_plains" -> 16777215;
case "ice_spikes" -> 11853020;
case "desert" -> 16421912;
case "swamp" -> 522674;
case "forest" -> 353825;
case "flower_forest" -> 2985545;
case "birch_forest" -> 3175492;
case "dark_forest" -> 4215066;
case "old_growth_birch_forest" -> 5807212;
case "old_growth_pine_taiga" -> 5858897;
case "old_growth_spruce_taiga" -> 8490617;
case "taiga" -> 747097;
case "snowy_taiga" -> 3233098;
case "savanna" -> 12431967;
case "savanna_plateau" -> 10984804;
case "windswept_hills" -> 6316128;
case "windswept_gravelly_hills" -> 8947848;
case "windswept_forest" -> 2250012;
case "windswept_savanna" -> 15063687;
case "jungle" -> 5470985;
case "sparse_jungle" -> 6458135;
case "bamboo_jungle" -> 7769620;
case "badlands" -> 14238997;
case "eroded_badlands" -> 16739645;
case "wooded_badlands" -> 11573093;
case "meadow" -> 9217136;
case "grove" -> 14675173;
case "snowy_slopes" -> 14348785;
case "frozen_peaks" -> 15399931;
case "jagged_peaks" -> 14937325;
case "stony_peaks" -> 13750737;
case "river" -> 255;
case "frozen_river" -> 10526975;
case "beach" -> 16440917;
case "snowy_beach" -> 16445632;
case "stony_shore" -> 10658436;
case "warm_ocean" -> 172;
case "lukewarm_ocean" -> 144;
case "deep_lukewarm_ocean" -> 64;
case "ocean" -> 112;
case "deep_ocean" -> 48;
case "cold_ocean" -> 2105456;
case "deep_cold_ocean" -> 2105400;
case "frozen_ocean" -> 7368918;
case "deep_frozen_ocean" -> 4210832;
case "mushroom_fields" -> 16711935;
case "dripstone_caves" -> 12690831;
case "lush_caves" -> 14652980;
case "nether_wastes" -> 12532539;
case "warped_forest" -> 4821115;
case "crimson_forest" -> 14485512;
case "soul_sand_valley" -> 6174768;
case "basalt_deltas" -> 4208182;
case "the_end" -> 8421631;
case "end_highlands" -> 12828041;
case "end_midlands" -> 15464630;
case "small_end_islands" -> 42;
case "end_barrens" -> 9474162;
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.getKey(biome).orElseThrow().getValue();
@@ -99,7 +32,7 @@ public class BiomesDataGenerator implements IDataGenerator {
//biomeDesc.addProperty("depth", biome.getDepth()); - Doesn't exist anymore in minecraft source
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.getDownfall());
return biomeDesc;
1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/EntitiesDataGenerator.java
+2 -2
View File
@@ -48,7 +48,7 @@ public class EntitiesDataGenerator implements IDataGenerator {
if (entityType == EntityType.PLAYER) return "UNKNOWN"; // fail early for player entities
Entity entity = EntityType.createInstanceFromId(Registry.ENTITY_TYPE.getRawId(entityType), 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.discard();
return switch (entity.getClass().getPackageName()) {
case "net.minecraft.entity.decoration", "net.minecraft.entity.decoration.painting" -> "Immobile";
@@ -58,7 +58,7 @@ public class EntitiesDataGenerator implements IDataGenerator {
case "net.minecraft.entity.passive" -> "Passive mobs";
case "net.minecraft.entity.vehicle" -> "Vehicles";
case "net.minecraft.entity" -> "UNKNOWN";
default -> throw new Error("Unexpected entity type: " + entity.getClass().getPackageName());
default -> throw new IllegalStateException("Unexpected entity type: " + entity.getClass().getPackageName());
};
}
1.18/src/main/java/dev/u9g/minecraftdatagenerator/generators/ItemsDataGenerator.java
+9 -9
View File
@@ -10,7 +10,9 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public class ItemsDataGenerator implements IDataGenerator {
@@ -22,10 +24,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) {
@@ -38,15 +42,11 @@ public class ItemsDataGenerator implements IDataGenerator {
itemDesc.addProperty("stackSize", item.getMaxCount());
List<EnchantmentTarget> enchantmentTargets = getApplicableEnchantmentTargets(item);
JsonArray enchantCategoriesArray = new JsonArray();
for (EnchantmentTarget target : enchantmentTargets) {
enchantCategoriesArray.add(EnchantmentsDataGenerator.getEnchantmentTargetName(target));
}
getApplicableEnchantmentTargets(item).forEach(enchantCategoriesArray::add);
if (item.isDamageable()) itemDesc.addProperty("maxDurability", item.getMaxDamage());
if (enchantCategoriesArray.size() > 0) {
if (!enchantCategoriesArray.isEmpty()) {
itemDesc.add("enchantCategories", enchantCategoriesArray);
}
@@ -58,7 +58,7 @@ public class ItemsDataGenerator implements IDataGenerator {
Identifier repairWithName = itemRegistry.getKey(repairWithItem).orElseThrow().getValue();
fixedWithArray.add(repairWithName.getPath());
}
if (fixedWithArray.size() > 0) {
if (!fixedWithArray.isEmpty()) {
itemDesc.add("repairWith", fixedWithArray);
}
}
1.18/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.18/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(