Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2026-01-06 15:51:42 +00:00
Code Issues Releases Activity

Add some SparklyPower-specific patches, update README

Browse Source
This commit is contained in:
MrPowerGamerBR
2024-06-13 11:57:18 -03:00
parent bd3776d9ee
commit 8252a38f3d
11 changed files with 117 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/server/0019-Reset-dirty-flag-when-loading-maps-from-the-disk.patch → patches/server/0018-Reset-dirty-flag-when-loading-maps-from-the-disk.patch
View File

0
patches/server/0020-Add-ClientboundPacketPreDispatchEvent.patch → patches/server/0019-Add-ClientboundPacketPreDispatchEvent.patch
View File

0
patches/server/0021-Helpful-NMS-packet-changes.patch → patches/server/0020-Helpful-NMS-packet-changes.patch
View File

0
patches/server/0022-Add-PlayerBlockDestroySpeedEvent.patch → patches/server/0021-Add-PlayerBlockDestroySpeedEvent.patch
View File

2
patches/server/0023-Parallel-world-ticking.patch → patches/server/0022-Parallel-world-ticking.patch
View File

@@ -1030,7 +1030,7 @@ index 786e4a8700cb84b16dd9b8892a0d1d5803924d81..a54754c4ff7bfb5101d362bc3a8b3073
}
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 58c38bc4361ddf24716f326b0c6fc626d434756e..45fc0a8c20eb549d51a7dc90e64bff59a8617fa3 100644
index 2f3c3442d8bb3990576b6a56142fefdd2c11fcc7..7517f6780b42f45eb85a266104648bcc8bea945a 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -421,8 +421,8 @@ public final class ItemStack implements DataComponentHolder {

2
patches/server/0018-Remap-SparklyPower-hacky-legacy-NBT-tags.patch → patches/server/0023-SPARKLYPOWER-Remap-SparklyPower-hacky-legacy-NBT-tag.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrPowerGamerBR <git@mrpowergamerbr.com>
Date: Sat, 1 Jun 2024 01:22:41 -0300
Subject: [PATCH] Remap SparklyPower hacky legacy NBT tags
Subject: [PATCH] SPARKLYPOWER Remap SparklyPower hacky legacy NBT tags
This is only useful for us in SparklyPower, but yeah...

72
patches/server/0024-SPARKLYPOWER-Add-custom-blocks.patch Normal file
View File

@@ -0,0 +1,72 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrPowerGamerBR <git@mrpowergamerbr.com>
Date: Wed, 12 Jun 2024 11:53:09 -0300
Subject: [PATCH] SPARKLYPOWER Add custom blocks
diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java
index 260906f493416d98ab574a7262fce5e9b7e40c64..92b6f69e60bfafe5f325b9b16df0e56a73c52124 100644
--- a/src/main/java/net/minecraft/world/level/block/Blocks.java
+++ b/src/main/java/net/minecraft/world/level/block/Blocks.java
@@ -42,9 +42,9 @@ import net.minecraft.world.level.material.PushReaction;
public class Blocks {
private static final BlockBehaviour.StatePredicate NOT_CLOSED_SHULKER = (state, world, pos) -> !(
- world.getBlockEntity(pos) instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity
- )
- || shulkerBoxBlockEntity.isClosed();
+ world.getBlockEntity(pos) instanceof ShulkerBoxBlockEntity shulkerBoxBlockEntity
+ )
+ || shulkerBoxBlockEntity.isClosed();
public static final Block AIR = register("air", new AirBlock(BlockBehaviour.Properties.of().replaceable().noCollission().noLootTable().air()));
public static final Block STONE = register(
"stone",
@@ -7658,6 +7658,48 @@ public class Blocks {
.requiredFeatures(FeatureFlags.UPDATE_1_21)
)
);
+ // SparklyPaper start - SparklyPower Survival custom blocks
+ // Blocks' strength should be synced with the replaced block on the client side!
+ public static final Block SPARKLYPOWER_RAINBOW_WOOL = register(
+ "sparklypower_rainbow_wool", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS))
+ );
+ public static final Block SPARKLYPOWER_RAINBOW_CONCRETE = register(
+ "sparklypower_rainbow_concrete", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS))
+ );
+ public static final Block SPARKLYPOWER_RAINBOW_TERRACOTTA = register(
+ "sparklypower_rainbow_terracotta", new Block(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS))
+ );
+ public static final Block SPARKLYPOWER_ASPHALT_SERVER = register(
+ "sparklypower_asphalt_server", new Block(
+ BlockBehaviour.Properties.of()
+ .mapColor(MapColor.COLOR_BLACK)
+ .instrument(NoteBlockInstrument.BASEDRUM)
+ .requiresCorrectToolForDrops()
+ .strength(1.5F, 6.0F)
+ )
+ );
+ public static final Block SPARKLYPOWER_ASPHALT_SERVER_SLAB = register(
+ "sparklypower_asphalt_server_slab",
+ new SlabBlock(
+ BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.0F, 6.0F)
+ )
+ );
+ public static final Block SPARKLYPOWER_ASPHALT_PLAYER = register(
+ "sparklypower_asphalt_player", new Block(
+ BlockBehaviour.Properties.of()
+ .mapColor(MapColor.COLOR_BLACK)
+ .instrument(NoteBlockInstrument.BASEDRUM)
+ .requiresCorrectToolForDrops()
+ .strength(1.5F, 6.0F)
+ )
+ );
+ public static final Block SPARKLYPOWER_ASPHALT_PLAYER_SLAB = register(
+ "sparklypower_asphalt_player_slab",
+ new SlabBlock(
+ BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.0F, 6.0F)
+ )
+ );
+ // SparklyPaper end
private static ToIntFunction<BlockState> litBlockEmission(int litLevel) {
return state -> state.getValue(BlockStateProperties.LIT) ? litLevel : 0;