Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

tasks.withType<JavaCompile> {
options.release.set(21)
options.release.set(25)
options.encoding = "UTF-8"
}

Expand Down Expand Up @@ -38,7 +38,7 @@ extensions.configure<LicenseExtension> {
tasks.named<Javadoc>("javadoc") {
options.encoding = "UTF-8"
(options as? StandardJavadocDocletOptions)?.apply {
source = "21"
source = "25"
links("https://docs.oracle.com/en/java/javase/11/docs/api/")
addStringOption("Xdoclint:none", "-quiet")
if (JavaVersion.current() >= JavaVersion.VERSION_1_9 && JavaVersion.current() < JavaVersion.VERSION_12) {
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/net/elytrium/limboapi/api/LimboFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ public interface LimboFactory {
/**
* Creates new virtual block from id and data.
*
* @param legacyID Block id.
* @param id Block protocol id, or a legacy id when {@code modern} is false.
* @param modern Use the latest supported version ids or 1.12.2 and lower.
*
* @return new virtual block.
*/
VirtualBlock createSimpleBlock(short legacyID, boolean modern);
VirtualBlock createSimpleBlock(char id, boolean modern);

/**
* Creates new virtual customizable block.
Expand All @@ -89,7 +89,7 @@ public interface LimboFactory {
*
* @return new virtual block.
*/
VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, short id);
VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, char id);

/**
* Creates new virtual customizable block.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public enum BlockEntityVersion {
MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9)),
MINECRAFT_1_21_11(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_11)),
MINECRAFT_26_1(EnumSet.of(ProtocolVersion.MINECRAFT_26_1)),
MINECRAFT_26_2(EnumSet.range(ProtocolVersion.MINECRAFT_26_2, ProtocolVersion.MAXIMUM_VERSION));
MINECRAFT_26_2(EnumSet.of(ProtocolVersion.MINECRAFT_26_2)),
MINECRAFT_26_3(EnumSet.range(ProtocolVersion.MINECRAFT_26_3, ProtocolVersion.MAXIMUM_VERSION));

private static final EnumMap<ProtocolVersion, BlockEntityVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
private static final Map<String, BlockEntityVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

public interface VirtualBlock {

short getModernID();
char getModernID();

String getModernStringID();

@Deprecated
short getID(ProtocolVersion version);
char getID(ProtocolVersion version);

short getBlockID(WorldVersion version);

Expand All @@ -27,7 +27,7 @@ public interface VirtualBlock {

boolean isSupportedOn(WorldVersion version);

short getBlockStateID(ProtocolVersion version);
char getBlockStateID(ProtocolVersion version);

boolean isSolid();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public enum WorldVersion {
MINECRAFT_1_21_9(ProtocolVersion.MINECRAFT_1_21_9),
MINECRAFT_1_21_11(ProtocolVersion.MINECRAFT_1_21_11),
MINECRAFT_26_1(ProtocolVersion.MINECRAFT_26_1),
MINECRAFT_26_2(EnumSet.range(ProtocolVersion.MINECRAFT_26_2, ProtocolVersion.MAXIMUM_VERSION));
MINECRAFT_26_2(ProtocolVersion.MINECRAFT_26_2),
MINECRAFT_26_3(EnumSet.range(ProtocolVersion.MINECRAFT_26_3, ProtocolVersion.MAXIMUM_VERSION));

private static final EnumMap<ProtocolVersion, WorldVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
private static final Map<String, WorldVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ allprojects {
version = "1.1.27-SNAPSHOT"

tasks.withType<JavaCompile> {
sourceCompatibility = JavaVersion.VERSION_21.toString()
targetCompatibility = JavaVersion.VERSION_21.toString()
sourceCompatibility = JavaVersion.VERSION_25.toString()
targetCompatibility = JavaVersion.VERSION_25.toString()
}

checkstyle {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ manifestUrl=https://launchermeta.mojang.com/mc/game/version_manifest.json
cacheValidMillis=604800000

# Change to invalidate mappings cache on CI
gameVersion=26.2
gameVersion=26.3
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gradle-shadow = "9.4.0" # https://github.com/GradleUp/shadow
gradle-spotbugs = "6.4.8" # https://github.com/spotbugs/spotbugs-gradle-plugin
minecraft-adventure = "4.15.0" # https://github.com/KyoriPowered/adventure
minecraft-bstats = "3.0.0" # https://github.com/Bastian/bStats
minecraft-velocity = "3.5.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
minecraft-velocity = "4.1.2-SNAPSHOT" # https://github.com/PaperMC/Velocity
tool-commons-io = "2.6" # https://github.com/apache/commons-io
tool-fastutil = "8.5.11" # https://github.com/vigna/fastutil/
tool-google-guava = "28.0-jre" # https://github.com/google/guava
Expand Down
28 changes: 24 additions & 4 deletions plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ plugins() {
}

compileJava() {
getOptions().getRelease().set(21)
getOptions().getRelease().set(25)
getOptions().setEncoding("UTF-8")
}

Expand Down Expand Up @@ -150,7 +150,8 @@ enum MinecraftVersion {
MINECRAFT_1_21_9(773),
MINECRAFT_1_21_11(774),
MINECRAFT_26_1(775),
MINECRAFT_26_2(776)
MINECRAFT_26_2(776),
MINECRAFT_26_3(777)

public static final List<MinecraftVersion> WORLD_VERSIONS = List.of(
MINECRAFT_1_13,
Expand All @@ -174,7 +175,8 @@ enum MinecraftVersion {
MINECRAFT_1_21_9,
MINECRAFT_1_21_11,
MINECRAFT_26_1,
MINECRAFT_26_2
MINECRAFT_26_2,
MINECRAFT_26_3
)

public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2
Expand Down Expand Up @@ -309,7 +311,25 @@ File generateData(MinecraftVersion version) {
File java = new File(System.getProperty("java.home"), "bin/java")
commandLine = ["bash", "-c", String.format(command, java)]
}
commandLine.execute([], parent).waitFor()
// The data generator logs a lot to stdout. Groovy's List.execute() wires the child's stdout
// and stderr to pipes that nothing ever drains, so the child blocks as soon as the OS pipe
// buffer fills - which happens at an arbitrary point and stalls the build indefinitely.
// Redirect the output to a file instead, and give the child EOF on stdin so it can never
// block waiting for console input either.
Process process = new ProcessBuilder(commandLine)
.directory(parent)
.redirectErrorStream(true)
.redirectOutput(new File(parent, "generator.log"))
.start()
process.getOutputStream().close()
int exitCode = process.waitFor()
if (exitCode != 0 || !new File(targetDir, "reports/blocks.json").exists()) {
throw new GradleException(
"Generating data for Minecraft ${version.getVersionName()} failed (exit code ${exitCode}), " +
"see ${new File(parent, "generator.log")}. Note that recent Minecraft versions require a " +
"newer JDK than the one running Gradle."
)
}

// Remove/compact files, reduces disk usage from ~2.9gb to ~92mb (or ~9.5mb on a compressed filesystem)
jarFile.delete()
Expand Down
89 changes: 89 additions & 0 deletions plugin/mapping/fallbackdata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,93 @@
{
"MINECRAFT_26_2": {
"minecraft:black_concrete_slab": "minecraft:black_concrete",
"minecraft:black_concrete_stairs": "minecraft:black_concrete",
"minecraft:black_wool_slab": "minecraft:black_wool",
"minecraft:black_wool_stairs": "minecraft:black_wool",
"minecraft:blue_concrete_slab": "minecraft:blue_concrete",
"minecraft:blue_concrete_stairs": "minecraft:blue_concrete",
"minecraft:blue_wool_slab": "minecraft:blue_wool",
"minecraft:blue_wool_stairs": "minecraft:blue_wool",
"minecraft:brown_concrete_slab": "minecraft:brown_concrete",
"minecraft:brown_concrete_stairs": "minecraft:brown_concrete",
"minecraft:brown_wool_slab": "minecraft:brown_wool",
"minecraft:brown_wool_stairs": "minecraft:brown_wool",
"minecraft:cyan_concrete_slab": "minecraft:cyan_concrete",
"minecraft:cyan_concrete_stairs": "minecraft:cyan_concrete",
"minecraft:cyan_wool_slab": "minecraft:cyan_wool",
"minecraft:cyan_wool_stairs": "minecraft:cyan_wool",
"minecraft:gray_concrete_slab": "minecraft:gray_concrete",
"minecraft:gray_concrete_stairs": "minecraft:gray_concrete",
"minecraft:gray_wool_slab": "minecraft:gray_wool",
"minecraft:gray_wool_stairs": "minecraft:gray_wool",
"minecraft:green_concrete_slab": "minecraft:green_concrete",
"minecraft:green_concrete_stairs": "minecraft:green_concrete",
"minecraft:green_wool_slab": "minecraft:green_wool",
"minecraft:green_wool_stairs": "minecraft:green_wool",
"minecraft:light_blue_concrete_slab": "minecraft:light_blue_concrete",
"minecraft:light_blue_concrete_stairs": "minecraft:light_blue_concrete",
"minecraft:light_blue_wool_slab": "minecraft:light_blue_wool",
"minecraft:light_blue_wool_stairs": "minecraft:light_blue_wool",
"minecraft:light_gray_concrete_slab": "minecraft:light_gray_concrete",
"minecraft:light_gray_concrete_stairs": "minecraft:light_gray_concrete",
"minecraft:light_gray_wool_slab": "minecraft:light_gray_wool",
"minecraft:light_gray_wool_stairs": "minecraft:light_gray_wool",
"minecraft:lime_concrete_slab": "minecraft:lime_concrete",
"minecraft:lime_concrete_stairs": "minecraft:lime_concrete",
"minecraft:lime_wool_slab": "minecraft:lime_wool",
"minecraft:lime_wool_stairs": "minecraft:lime_wool",
"minecraft:magenta_concrete_slab": "minecraft:magenta_concrete",
"minecraft:magenta_concrete_stairs": "minecraft:magenta_concrete",
"minecraft:magenta_wool_slab": "minecraft:magenta_wool",
"minecraft:magenta_wool_stairs": "minecraft:magenta_wool",
"minecraft:orange_concrete_slab": "minecraft:orange_concrete",
"minecraft:orange_concrete_stairs": "minecraft:orange_concrete",
"minecraft:orange_poplar_leaves": "minecraft:oak_leaves",
"minecraft:orange_wool_slab": "minecraft:orange_wool",
"minecraft:orange_wool_stairs": "minecraft:orange_wool",
"minecraft:pink_concrete_slab": "minecraft:pink_concrete",
"minecraft:pink_concrete_stairs": "minecraft:pink_concrete",
"minecraft:pink_wool_slab": "minecraft:pink_wool",
"minecraft:pink_wool_stairs": "minecraft:pink_wool",
"minecraft:poplar_button": "minecraft:oak_button",
"minecraft:poplar_door": "minecraft:oak_door",
"minecraft:poplar_fence": "minecraft:oak_fence",
"minecraft:poplar_fence_gate": "minecraft:oak_fence_gate",
"minecraft:poplar_hanging_sign": "minecraft:oak_hanging_sign",
"minecraft:poplar_log": "minecraft:oak_log",
"minecraft:poplar_planks": "minecraft:oak_planks",
"minecraft:poplar_pressure_plate": "minecraft:oak_pressure_plate",
"minecraft:poplar_sapling": "minecraft:oak_sapling",
"minecraft:poplar_shelf": "minecraft:oak_shelf",
"minecraft:poplar_sign": "minecraft:oak_sign",
"minecraft:poplar_slab": "minecraft:oak_slab",
"minecraft:poplar_stairs": "minecraft:oak_stairs",
"minecraft:poplar_trapdoor": "minecraft:oak_trapdoor",
"minecraft:poplar_wall_hanging_sign": "minecraft:oak_wall_hanging_sign",
"minecraft:poplar_wall_sign": "minecraft:oak_wall_sign",
"minecraft:poplar_wood": "minecraft:oak_wood",
"minecraft:potted_poplar_sapling": "minecraft:potted_oak_sapling",
"minecraft:purple_concrete_slab": "minecraft:purple_concrete",
"minecraft:purple_concrete_stairs": "minecraft:purple_concrete",
"minecraft:purple_wool_slab": "minecraft:purple_wool",
"minecraft:purple_wool_stairs": "minecraft:purple_wool",
"minecraft:red_concrete_slab": "minecraft:red_concrete",
"minecraft:red_concrete_stairs": "minecraft:red_concrete",
"minecraft:red_poplar_leaves": "minecraft:oak_leaves",
"minecraft:red_wool_slab": "minecraft:red_wool",
"minecraft:red_wool_stairs": "minecraft:red_wool",
"minecraft:stripped_poplar_log": "minecraft:stripped_oak_log",
"minecraft:stripped_poplar_wood": "minecraft:stripped_oak_wood",
"minecraft:white_concrete_slab": "minecraft:white_concrete",
"minecraft:white_concrete_stairs": "minecraft:white_concrete",
"minecraft:white_wool_slab": "minecraft:white_wool",
"minecraft:white_wool_stairs": "minecraft:white_wool",
"minecraft:yellow_concrete_slab": "minecraft:yellow_concrete",
"minecraft:yellow_concrete_stairs": "minecraft:yellow_concrete",
"minecraft:yellow_poplar_leaves": "minecraft:oak_leaves",
"minecraft:yellow_wool_slab": "minecraft:yellow_wool",
"minecraft:yellow_wool_stairs": "minecraft:yellow_wool"
},
"MINECRAFT_26_1": {
"minecraft:sulfur": "minecraft:sandstone",
"minecraft:potent_sulfur": "minecraft:end_stone",
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
)
public class LimboAPI implements LimboFactory {

private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 776;
private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 777;

@MonotonicNonNull
private static Logger LOGGER;
Expand Down Expand Up @@ -357,16 +357,16 @@ public VirtualBlock createSimpleBlock(String modernID, Map<String, String> prope
}

@Override
public VirtualBlock createSimpleBlock(short id, boolean modern) {
public VirtualBlock createSimpleBlock(char id, boolean modern) {
if (modern) {
return SimpleBlock.solid(id);
} else {
return SimpleBlock.fromLegacyID(id);
return SimpleBlock.fromLegacyID((short) id);
}
}

@Override
public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, short id) {
public VirtualBlock createSimpleBlock(boolean solid, boolean air, boolean motionBlocking, char id) {
return new SimpleBlock(solid, air, motionBlocking, id);
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/src/main/java/net/elytrium/limboapi/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static class MAIN {
"1_13, 1_13_1, 1_13_2, 1_14, 1_14_1, 1_14_2, 1_14_3, 1_14_4, 1_15, 1_15_1, 1_15_2,",
"1_16, 1_16_1, 1_16_2, 1_16_3, 1_16_4, 1_17, 1_17_1, 1_18, 1_18_2, 1_19, 1_19_1, 1_19_3,",
"1_20, 1_20_2, 1_20_3, 1_20_5, 1_21, 1_21_2, 1_21_4, 1_21_5, 1_21_6, 1_21_7, 1_21_9, 1_21_11,",
"26_1, 26_2, LATEST"
"26_1, 26_2, 26_3, LATEST"
})
public String PREPARE_MIN_VERSION = "1_7_2";
public String PREPARE_MAX_VERSION = "LATEST";
Expand Down
Loading
Loading