From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrPowerGamerBR 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 litBlockEmission(int litLevel) { return state -> state.getValue(BlockStateProperties.LIT) ? litLevel : 0; diff --git a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java index 2652359438399f2c3b1092f5dcb37a106ab22068..b5ae0f4f68fc2d90043cbbe092310bd6eb8e004d 100644 --- a/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java +++ b/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java @@ -123,7 +123,9 @@ public class LegacyTest extends AbstractTestingBase { // 1.20.5 Material.ARMADILLO_SCUTE, Material.ARMADILLO_SPAWN_EGG, Material.BOGGED_SPAWN_EGG, Material.WIND_CHARGE, Material.WOLF_ARMOR, Material.VAULT, Material.HEAVY_CORE, Material.MACE, Material.FLOW_BANNER_PATTERN, Material.GUSTER_BANNER_PATTERN, Material.FLOW_ARMOR_TRIM_SMITHING_TEMPLATE, Material.BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, Material.FLOW_POTTERY_SHERD, Material.GUSTER_POTTERY_SHERD, Material.SCRAPE_POTTERY_SHERD, Material.BREEZE_ROD, Material.OMINOUS_TRIAL_KEY, Material.OMINOUS_BOTTLE, - // + // SparklyPaper start - custom blocks + Material.SPARKLYPOWER_RAINBOW_WOOL, Material.SPARKLYPOWER_RAINBOW_CONCRETE, Material.SPARKLYPOWER_RAINBOW_TERRACOTTA, Material.SPARKLYPOWER_ASPHALT_SERVER, Material.SPARKLYPOWER_ASPHALT_SERVER_SLAB, Material.SPARKLYPOWER_ASPHALT_PLAYER, Material.SPARKLYPOWER_ASPHALT_PLAYER_SLAB, + // SparklyPaper end Material.LEGACY_AIR, Material.LEGACY_DEAD_BUSH, Material.LEGACY_BURNING_FURNACE, Material.LEGACY_WALL_SIGN, Material.LEGACY_REDSTONE_TORCH_OFF, Material.LEGACY_SKULL, Material.LEGACY_REDSTONE_COMPARATOR_ON, Material.LEGACY_WALL_BANNER, Material.LEGACY_MONSTER_EGG)); private final Set INVERSION_FAILS = new HashSet<>(Arrays.asList(Material.LEGACY_DOUBLE_STEP, Material.LEGACY_GLOWING_REDSTONE_ORE, Material.LEGACY_DIODE_BLOCK_ON, Material.LEGACY_REDSTONE_LAMP_ON, Material.LEGACY_WOOD_DOUBLE_STEP, diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java index 1b1d51a68c0abe7d8f0aa1172064192c71ae645e..5d694ef3ff1bc1e193ff321a09eb86a6239c4bb5 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java @@ -74,6 +74,6 @@ public abstract class AbstractTestingBase { } } INVALIDATED_MATERIALS = builder.build(); - assertEquals(610, INVALIDATED_MATERIALS.size(), "Expected 610 invalidated materials (got " + INVALIDATED_MATERIALS.size() + ")"); + assertEquals(617, INVALIDATED_MATERIALS.size(), "Expected 610 invalidated materials (got " + INVALIDATED_MATERIALS.size() + ")"); // SparklyPaper - custom blocks (this always needs to be the amount of non-legacy materials in the enum) } }