Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -1134,6 +1134,7 @@ Setting a color to black (#000000) will make it invisible.""")
put("minecraft:stony_peaks", 0x888888);
put("minecraft:stony_shore", 0xA2A284);
put("minecraft:sunflower_plains", 0xB5DB88);
put("minecraft:sulfur_caves", 0xc2b261);
put("minecraft:swamp", 0x07F9B2);
put("minecraft:taiga", 0x0B6659);
put("minecraft:the_end", 0x8080FF);
Expand Down
27 changes: 27 additions & 0 deletions core/src/main/java/net/pl3x/map/core/world/Blocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -1213,6 +1213,33 @@ public class Blocks {
public static final Block GOLDEN_DANDELION = register(new Block(1168, "minecraft:golden_dandelion", 0xA56D29));
public static final Block POTTED_GOLDEN_DANDELION = register(new Block(1169, "minecraft:potted_golden_dandelion", 0xA56D29));

public static final Block CINNABAR = register(new Block(1170, "minecraft:cinnabar", 0x98534F));
public static final Block CINNABAR_SLAB = register(new Block(1171, "minecraft:cinnabar_slab", 0x98534F));
public static final Block CINNABAR_STAIRS = register(new Block(1172, "minecraft:cinnabar_stairs", 0x98534F));
public static final Block CINNABAR_WALL = register(new Block(1173, "minecraft:cinnabar_wall", 0x98534F));
public static final Block POLISHED_CINNABAR = register(new Block(1174, "minecraft:polished_cinnabar", 0x993A37));
public static final Block POLISHED_CINNABAR_SLAB = register(new Block(1175, "minecraft:polished_cinnabar_slab", 0x993A37));
public static final Block POLISHED_CINNABAR_STAIRS = register(new Block(1176, "minecraft:polished_cinnabar_stairs", 0x993A37));
public static final Block POLISHED_CINNABAR_WALL = register(new Block(1177, "minecraft:polished_cinnabar_wall", 0x993A37));
public static final Block CINNABAR_BRICKS = register(new Block(1178, "minecraft:cinnabar_bricks", 0x953836));
public static final Block CINNABAR_BRICK_SLAB = register(new Block(1179, "minecraft:cinnabar_brick_slab", 0x953836));
public static final Block CINNABAR_BRICK_STAIRS = register(new Block(1180, "minecraft:cinnabar_brick_stairs", 0x953836));
public static final Block CINNABAR_BRICK_WALL = register(new Block(1181, "minecraft:cinnabar_brick_wall", 0x953836));
public static final Block CHISELED_CINNABAR = register(new Block(1182, "minecraft:chiseled_cinnabar", 0x923737));
public static final Block SULFUR = register(new Block(1183, "minecraft:sulfur", 0xBEAF66));
public static final Block POTENT_SULFUR = register(new Block(1184, "minecraft:potent_sulfur", 0xD3D162));
public static final Block SULFUR_SLAB = register(new Block(1185, "minecraft:sulfur_slab", 0xBEAF66));
public static final Block SULFUR_STAIRS = register(new Block(1186, "minecraft:sulfur_stairs", 0xBEAF66));
public static final Block SULFUR_WALL = register(new Block(1187, "minecraft:sulfur_wall", 0xBEAF66));
public static final Block POLISHED_SULFUR = register(new Block(1188, "minecraft:polished_sulfur", 0xBDAB5B));
public static final Block POLISHED_SULFUR_SLAB = register(new Block(1189, "minecraft:polished_sulfur_slab", 0xBDAB5B));
public static final Block POLISHED_SULFUR_STAIRS = register(new Block(1190, "minecraft:polished_sulfur_stairs", 0xBDAB5B));
public static final Block POLISHED_SULFUR_WALL = register(new Block(1191, "minecraft:polished_sulfur_wall", 0xBDAB5B));
public static final Block SULFUR_BRICKS = register(new Block(1192, "minecraft:sulfur_bricks", 0xBBA85B));
public static final Block SULFUR_BRICK_SLAB = register(new Block(1193, "minecraft:sulfur_brick_slab", 0xBBA85B));
public static final Block SULFUR_BRICK_STAIRS = register(new Block(1194, "minecraft:sulfur_brick_stairs", 0xBBA85B));
public static final Block SULFUR_SPIKE = register(new Block(1195, "minecraft:sulfur_spike", 0xB8AB5F));

private static Block register(Block block) {
blocks.put(block.getKey(), block);
return block;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void onInitializeClient() {
ClientPlayNetworking.registerGlobalReceiver(ClientboundMapPayload.TYPE, ClientboundMapPayload::handle);

ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
if (client.isSingleplayer()) {
if (client.hasSingleplayerServer()) {
return;
}
setEnabled(true);
Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
bukkit="26.1.2.build.+"
minecraft="26.1.2"
bukkit="26.2.build.+"
minecraft="26.2"

# https://fabricmc.net/develop/
fabricApi="0.152.1+26.1.2"
fabricLoader="0.19.1"
fabricLoom="1.16-SNAPSHOT"
fabricApi="0.152.2+26.2"
fabricLoader="0.19.3"
fabricLoom="1.17-SNAPSHOT"

#forge="1.20.2-48.0.6"
#forgeGradle="[6.0,6.2)"
Expand All @@ -19,7 +19,7 @@ shadowJar="8.3.9" # https://github.com/GradleUp/shadow

adventure="4.25.0" # https://github.com/KyoriPowered/adventure
adventureBukkit="4.4.1" # https://github.com/KyoriPowered/adventure-platform
adventureFabric="6.9.0" # https://github.com/KyoriPowered/adventure-platform-fabric
adventureFabric="7.0.0-SNAPSHOT" # https://github.com/KyoriPowered/adventure-platform-fabric

cloud="2.0.0" # https://github.com/incendo/cloud
cloud-minecraft="2.0.0-SNAPSHOT" # https://github.com/Incendo/cloud-minecraft
Expand All @@ -33,10 +33,10 @@ log4j="2.25.2" # https://github.com/apache/logging-log4j2

bluenbt="3.5.0" # https://github.com/BlueMap-Minecraft/BlueNBT

lz4Java="1.8.0" # https://github.com/lz4/lz4-java
lz4Java="1.11.0" # https://github.com/yawkat/lz4-java
simpleYaml="1.8.4" # https://github.com/Carleslc/Simple-YAML
slf4j="2.0.1"
undertow="2.4.0.Beta1" # https://github.com/undertow-io/undertow
undertow="2.4.1.Final" # https://github.com/undertow-io/undertow
#xnio="3.8.8.Final"


Expand Down Expand Up @@ -78,7 +78,7 @@ adventurePlatformFabric = { group = "net.kyori", name = "adventure-platform-fabr

bluenbt = { module = "de.bluecolored:bluenbt", version.ref = "bluenbt" }
caffeine = { group = "com.github.ben-manes.caffeine", name = "caffeine", version.ref = "caffeine" }
lz4Java = { group = "org.lz4", name = "lz4-java", version.ref = "lz4Java" }
lz4Java = { group = "at.yawk.lz4", name = "lz4-java", version.ref = "lz4Java" }
simpleYaml = { group = "com.github.Carleslc.Simple-YAML", name = "Simple-Yaml", version.ref = "simpleYaml" }


Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading