sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

block cleanup #6

Browse source
This commit is contained in:
Sen 2025-06-21 14:04:15 +02:00
parent 9a6abe495c
commit 7b25e6181e
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
27 changed files with 263 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

17
server/src/main/java/server/clipboard/ReorderRegistry.java
View file

@ -8,6 +8,7 @@ import java.util.Set;
import common.block.Block;
import common.block.artificial.BlockBed;
import common.block.artificial.BlockDoor;
import common.block.artificial.BlockFlowerPot;
import common.block.foliage.BlockFlower;
import common.color.DyeColor;
import common.init.BlockRegistry;
@ -50,8 +51,8 @@ public abstract class ReorderRegistry {
PLACE_LAST.add(Blocks.tallgrass);
PLACE_LAST.add(Blocks.deadbush);
PLACE_LAST.add(Blocks.piston_head);
for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) {
PLACE_LAST.add(BlockFlower.getByType(type));
for(BlockFlower block : BlockFlower.FLOWERS) {
PLACE_LAST.add(block);
}
PLACE_LAST.add(Blocks.brown_mushroom);
PLACE_LAST.add(Blocks.red_mushroom_block);
@ -84,7 +85,9 @@ public abstract class ReorderRegistry {
PLACE_LAST.add(Blocks.cocoa);
PLACE_LAST.add(Blocks.tripwire_hook);
PLACE_LAST.add(Blocks.string);
PLACE_LAST.add(Blocks.flower_pot);
for(BlockFlowerPot block : BlockFlowerPot.POTS) {
PLACE_LAST.add(block);
}
PLACE_LAST.add(Blocks.carrot);
PLACE_LAST.add(Blocks.potato);
PLACE_LAST.add(Blocks.wooden_button);
@ -141,8 +144,8 @@ public abstract class ReorderRegistry {
addAttach(Blocks.piston_head.getStateFromMeta(offset + 1), Facing.DOWN);
addCardinals(Blocks.piston_head, offset + 2, offset + 5, offset + 3, offset + 4);
}
for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) {
addAttach(BlockFlower.getByType(type), Facing.DOWN);
for(BlockFlower block : BlockFlower.FLOWERS) {
addAttach(block, Facing.DOWN);
}
addAttach(Blocks.brown_mushroom, Facing.DOWN);
addAttach(Blocks.red_mushroom, Facing.DOWN);
@ -200,7 +203,9 @@ public abstract class ReorderRegistry {
addCardinals(Blocks.tripwire_hook, offset + 2, offset + 3, offset + 0, offset + 1);
}
addAttach(Blocks.string, Facing.DOWN);
addAttach(Blocks.flower_pot, Facing.DOWN);
for(BlockFlowerPot block : BlockFlowerPot.POTS) {
addAttach(block, Facing.DOWN);
}
addAttach(Blocks.carrot, Facing.DOWN);
addAttach(Blocks.potato, Facing.DOWN);
addAttach(Blocks.anvil, Facing.DOWN);

2
server/src/main/java/server/world/Converter.java
View file

@ -350,6 +350,7 @@ public abstract class Converter {
mapTile(TileEntityComparator.class, "Comparator", "comparator");
mapTile(TileEntityBanner.class, "Banner", "banner");
/*
mapBlock(Blocks.stone.getState(), 1);
mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, false), 1, 1);
mapBlock(Blocks.rock.getState().withProperty(BlockRock.SMOOTH, true), 1, 2);
@ -859,6 +860,7 @@ public abstract class Converter {
}
}, 252);
mapBlock(Blocks.obsidian, 255);
*/
}
private static Object read(DataInput input, byte id) throws IOException {