Skip to content

1.18 update #1

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

Merged
ColorsWind merged 1 commit into from
Jan 2, 2023
Merged

1.18 update #1

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
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apply plugin: "java-library"
apply plugin: "maven-publish"

ext.majorVersion = 2
ext.minorVersion = 5
ext.minecraftVersion = "1.17"
ext.minorVersion = 6
ext.minecraftVersion = "1.18"

// Supplied by Jenkins
ext.buildNumber = System.env.BUILD_NUMBER == null ? "x" : "$System.env.BUILD_NUMBER"
Expand All @@ -14,8 +14,8 @@ group = "com.meowj"
archivesBaseName = "LangUtils-mc$minecraftVersion"
version = "$majorVersion.$minorVersion.$buildNumber".toString()

sourceCompatibility = 16
targetCompatibility = 16
sourceCompatibility = 1.8
targetCompatibility = 1.8

// extra compile warnings
compileJava {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meowj/langutils/LangUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public void onEnable() {
warn("This API is not designed for Cauldron/KCauldron server, but it should work without problems for VANILLA items/entities. Again, you cannot use this API with items/entities in mods.");
}

config.addDefault("FallbackLanguage", "en_us");
config.addDefault("FallbackLanguage", "en_gb");
List<String> defaultLang = new ArrayList<>();
defaultLang.add("en_us");
defaultLang.add("en_gb");
defaultLang.add("zh_cn");
config.addDefault("LoadLanguage", defaultLang);
config.options().copyDefaults(true);
Expand Down
66 changes: 23 additions & 43 deletions src/main/java/com/meowj/langutils/lang/convert/EnumBiome.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,18 @@

public enum EnumBiome {
BADLANDS(Biome.BADLANDS, "biome.minecraft.badlands"),
BADLANDS_PLATEAU(Biome.BADLANDS_PLATEAU, "biome.minecraft.badlands_plateau"),
BAMBOO_JUNGLE(Biome.BAMBOO_JUNGLE, "biome.minecraft.bamboo_jungle"),
BAMBOO_JUNGLE_HILLS(Biome.BAMBOO_JUNGLE_HILLS, "biome.minecraft.bamboo_jungle_hills"),
BASALT_DELTAS(Biome.BASALT_DELTAS, "biome.minecraft.basalt_deltas"),
BEACH(Biome.BEACH, "biome.minecraft.beach"),
BIRCH_FOREST(Biome.BIRCH_FOREST, "biome.minecraft.birch_forest"),
BIRCH_FOREST_HILLS(Biome.BIRCH_FOREST_HILLS, "biome.minecraft.birch_forest_hills"),
COLD_OCEAN(Biome.COLD_OCEAN, "biome.minecraft.cold_ocean"),
CRIMSON_FOREST(Biome.CRIMSON_FOREST, "biome.minecraft.crimson_forest"),
DARK_FOREST(Biome.DARK_FOREST, "biome.minecraft.dark_forest"),
DARK_FOREST_HILLS(Biome.DARK_FOREST_HILLS, "biome.minecraft.dark_forest_hills"),
DEEP_COLD_OCEAN(Biome.DEEP_COLD_OCEAN, "biome.minecraft.deep_cold_ocean"),
DEEP_FROZEN_OCEAN(Biome.DEEP_FROZEN_OCEAN, "biome.minecraft.deep_frozen_ocean"),
DEEP_LUKEWARM_OCEAN(Biome.DEEP_LUKEWARM_OCEAN, "biome.minecraft.deep_lukewarm_ocean"),
DEEP_OCEAN(Biome.DEEP_OCEAN, "biome.minecraft.deep_ocean"),
DEEP_WARM_OCEAN(Biome.DEEP_WARM_OCEAN, "biome.minecraft.deep_warm_ocean"),
DESERT(Biome.DESERT, "biome.minecraft.desert"),
DESERT_HILLS(Biome.DESERT_HILLS, "biome.minecraft.desert_hills"),
DESERT_LAKES(Biome.DESERT_LAKES, "biome.minecraft.desert_lakes"),
DRIPSTONE_CAVES(Biome.DRIPSTONE_CAVES, "biome.minecraft.dripstone_caves"),
END_BARRENS(Biome.END_BARRENS, "biome.minecraft.end_barrens"),
END_HIGHLANDS(Biome.END_HIGHLANDS, "biome.minecraft.end_highlands"),
Expand All @@ -33,61 +28,46 @@ public enum EnumBiome {
FLOWER_FOREST(Biome.FLOWER_FOREST, "biome.minecraft.flower_forest"),
FOREST(Biome.FOREST, "biome.minecraft.forest"),
FROZEN_OCEAN(Biome.FROZEN_OCEAN, "biome.minecraft.frozen_ocean"),
FROZEN_PEAKS(Biome.FROZEN_PEAKS, "biome.minecraft.frozen_peaks"),
FROZEN_RIVER(Biome.FROZEN_RIVER, "biome.minecraft.frozen_river"),
GIANT_SPRUCE_TAIGA(Biome.GIANT_SPRUCE_TAIGA, "biome.minecraft.giant_spruce_taiga"),
GIANT_SPRUCE_TAIGA_HILLS(Biome.GIANT_SPRUCE_TAIGA_HILLS, "biome.minecraft.giant_spruce_taiga_hills"),
GIANT_TREE_TAIGA(Biome.GIANT_TREE_TAIGA, "biome.minecraft.giant_tree_taiga"),
GIANT_TREE_TAIGA_HILLS(Biome.GIANT_TREE_TAIGA_HILLS, "biome.minecraft.giant_tree_taiga_hills"),
GRAVELLY_MOUNTAINS(Biome.GRAVELLY_MOUNTAINS, "biome.minecraft.gravelly_mountains"),
GROVE(Biome.GROVE, "biome.minecraft.grove"),
ICE_SPIKES(Biome.ICE_SPIKES, "biome.minecraft.ice_spikes"),
JAGGED_PEAKS(Biome.JAGGED_PEAKS, "biome.minecraft.jagged_peaks"),
JUNGLE(Biome.JUNGLE, "biome.minecraft.jungle"),
JUNGLE_EDGE(Biome.JUNGLE_EDGE, "biome.minecraft.jungle_edge"),
JUNGLE_HILLS(Biome.JUNGLE_HILLS, "biome.minecraft.jungle_hills"),
LUKEWARM_OCEAN(Biome.LUKEWARM_OCEAN, "biome.minecraft.lukewarm_ocean"),
LUSH_CAVES(Biome.LUSH_CAVES, "biome.minecraft.lush_caves"),
MODIFIED_BADLANDS_PLATEAU(Biome.MODIFIED_BADLANDS_PLATEAU, "biome.minecraft.modified_badlands_plateau"),
MODIFIED_GRAVELLY_MOUNTAINS(Biome.MODIFIED_GRAVELLY_MOUNTAINS, "biome.minecraft.modified_gravelly_mountains"),
MODIFIED_JUNGLE(Biome.MODIFIED_JUNGLE, "biome.minecraft.modified_jungle"),
MODIFIED_JUNGLE_EDGE(Biome.MODIFIED_JUNGLE_EDGE, "biome.minecraft.modified_jungle_edge"),
MODIFIED_WOODED_BADLANDS_PLATEAU(Biome.MODIFIED_WOODED_BADLANDS_PLATEAU, "biome.minecraft.modified_wooded_badlands_plateau"),
MOUNTAIN_EDGE(Biome.MOUNTAIN_EDGE, "biome.minecraft.mountain_edge"),
MOUNTAINS(Biome.MOUNTAINS, "biome.minecraft.mountains"),
MUSHROOM_FIELD_SHORE(Biome.MUSHROOM_FIELD_SHORE, "biome.minecraft.mushroom_field_shore"),
MEADOW(Biome.MEADOW, "biome.minecraft.meadow"),
MUSHROOM_FIELDS(Biome.MUSHROOM_FIELDS, "biome.minecraft.mushroom_fields"),
NETHER_WASTES(Biome.NETHER_WASTES, "biome.minecraft.nether_wastes"),
SOUL_SAND_VALLEY(Biome.SOUL_SAND_VALLEY, "biome.minecraft.soul_sand_valley"),
CRIMSON_FOREST(Biome.CRIMSON_FOREST, "biome.minecraft.crimson_forest"),
WARPED_FOREST(Biome.WARPED_FOREST, "biome.minecraft.warped_forest"),
BASALT_DELTAS(Biome.BASALT_DELTAS, "biome.minecraft.basalt_deltas"),
OCEAN(Biome.OCEAN, "biome.minecraft.ocean"),
OLD_GROWTH_BIRCH_FOREST(Biome.OLD_GROWTH_BIRCH_FOREST, "biome.minecraft.old_growth_birch_forest"),
OLD_GROWTH_PINE_TAIGA(Biome.OLD_GROWTH_PINE_TAIGA, "biome.minecraft.old_growth_pine_taiga"),
OLD_GROWTH_SPRUCE_TAIGA(Biome.OLD_GROWTH_SPRUCE_TAIGA, "biome.minecraft.old_growth_spruce_taiga"),
PLAINS(Biome.PLAINS, "biome.minecraft.plains"),
RIVER(Biome.RIVER, "biome.minecraft.river"),
SAVANNA(Biome.SAVANNA, "biome.minecraft.savanna"),
SAVANNA_PLATEAU(Biome.SAVANNA_PLATEAU, "biome.minecraft.savanna_plateau"),
SHATTERED_SAVANNA(Biome.SHATTERED_SAVANNA, "biome.minecraft.shattered_savanna"),
SHATTERED_SAVANNA_PLATEAU(Biome.SHATTERED_SAVANNA_PLATEAU, "biome.minecraft.shattered_savanna_plateau"),
SHATTERED_SAVANNA(Biome.WINDSWEPT_SAVANNA, "biome.minecraft.windswept_savanna"),
SMALL_END_ISLANDS(Biome.SMALL_END_ISLANDS, "biome.minecraft.small_end_islands"),
SNOWY_BEACH(Biome.SNOWY_BEACH, "biome.minecraft.snowy_beach"),
SNOWY_MOUNTAINS(Biome.SNOWY_MOUNTAINS, "biome.minecraft.snowy_mountains"),
SNOWY_PLAINS(Biome.SNOWY_PLAINS, "biome.minecraft.snowy_plains"),
SNOWY_SLOPES(Biome.SNOWY_SLOPES, "biome.minecraft.snowy_slopes"),
SNOWY_TAIGA(Biome.SNOWY_TAIGA, "biome.minecraft.snowy_taiga"),
SNOWY_TAIGA_HILLS(Biome.SNOWY_TAIGA_HILLS, "biome.minecraft.snowy_taiga_hills"),
SNOWY_TAIGA_MOUNTAINS(Biome.SNOWY_TAIGA_MOUNTAINS, "biome.minecraft.snowy_taiga_mountains"),
SNOWY_TUNDRA(Biome.SNOWY_TUNDRA, "biome.minecraft.snowy_tundra"),
STONE_SHORE(Biome.STONE_SHORE, "biome.minecraft.stone_shore"),
SOUL_SAND_VALLEY(Biome.SOUL_SAND_VALLEY, "biome.minecraft.soul_sand_valley"),
SPARSE_JUNGLE(Biome.SPARSE_JUNGLE, "biome.minecraft.sparse_jungle"),
STONY_PEAKS(Biome.STONY_PEAKS, "biome.minecraft.stony_peaks"),
STONY_SHORE(Biome.STONY_SHORE, "biome.minecraft.stony_shore"),
SUNFLOWER_PLAINS(Biome.SUNFLOWER_PLAINS, "biome.minecraft.sunflower_plains"),
SWAMP(Biome.SWAMP, "biome.minecraft.swamp"),
SWAMP_HILLS(Biome.SWAMP_HILLS, "biome.minecraft.swamp_hills"),
TAIGA(Biome.TAIGA, "biome.minecraft.taiga"),
TAIGA_HILLS(Biome.TAIGA_HILLS, "biome.minecraft.taiga_hills"),
TAIGA_MOUNTAINS(Biome.TAIGA_MOUNTAINS, "biome.minecraft.taiga_mountains"),
TALL_BIRCH_FOREST(Biome.TALL_BIRCH_FOREST, "biome.minecraft.tall_birch_forest"),
TALL_BIRCH_HILLS(Biome.TALL_BIRCH_HILLS, "biome.minecraft.tall_birch_hills"),
THE_END(Biome.THE_END, "biome.minecraft.the_end"),
THE_VOID(Biome.THE_VOID, "biome.minecraft.the_void"),
WARM_OCEAN(Biome.WARM_OCEAN, "biome.minecraft.warm_ocean"),
WOODED_BADLANDS_PLATEAU(Biome.WOODED_BADLANDS_PLATEAU, "biome.minecraft.wooded_badlands_plateau"),
WOODED_HILLS(Biome.WOODED_HILLS, "biome.minecraft.wooded_hills"),
WOODED_MOUNTAINS(Biome.WOODED_MOUNTAINS, "biome.minecraft.wooded_mountains");
WARPED_FOREST(Biome.WARPED_FOREST, "biome.minecraft.warped_forest"),
WINDSWEPT_FOREST(Biome.WINDSWEPT_FOREST, "biome.minecraft.windswept_forest"),
WINDSWEPT_GRAVELLY_HILLS(Biome.WINDSWEPT_GRAVELLY_HILLS, "biome.minecraft.windswept_gravelly_hills"),
WINDSWEPT_HILLS(Biome.WINDSWEPT_HILLS, "biome.minecraft.windswept_hills"),
WOODED_BADLANDS(Biome.WOODED_BADLANDS, "biome.minecraft.wooded_badlands");

private static final Map<Biome, EnumBiome> lookup = new EnumMap<>(Biome.class);

Expand All @@ -96,8 +76,8 @@ public enum EnumBiome {
lookup.put(biome.getBiome(), biome);
}

private Biome biome;
private String unlocalizedName;
private final Biome biome;
private final String unlocalizedName;

EnumBiome(Biome biome, String unlocalizedName) {
this.biome = biome;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/meowj/langutils/lang/convert/EnumItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,7 @@ public enum EnumItem {
MUSIC_DISC_11(Material.MUSIC_DISC_11, "item.minecraft.music_disc_11"),
MUSIC_DISC_WAIT(Material.MUSIC_DISC_WAIT, "item.minecraft.music_disc_wait"),
MUSIC_DISC_PIGSTEP(Material.MUSIC_DISC_PIGSTEP, "item.minecraft.music_disc_pigstep"),
MUSIC_DISC_OTHERSIDE(Material.MUSIC_DISC_OTHERSIDE, "item.minecraft.music_disc_otherside"),
BONE(Material.BONE, "item.minecraft.bone"),
INK_SAC(Material.INK_SAC, "item.minecraft.ink_sac"),
// ROSE_RED(Material.ROSE_RED, "item.minecraft.rose_red"),
Expand Down
Loading