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

remove banners

Browse source
This commit is contained in:
Sen 2025-07-06 18:13:19 +02:00
parent b0f33c3be1
commit dd1b9c5e52
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
58 changed files with 6 additions and 1438 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,8 +124,6 @@ public abstract class ReorderRegistry {
PLACE_FINAL.add(Blocks.cake);
PLACE_FINAL.add(Blocks.piston_head);
PLACE_FINAL.add(Blocks.piston_extension);
PLACE_FINAL.add(Blocks.banner);
PLACE_FINAL.add(Blocks.wall_banner);
}
/*

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

@ -10,6 +10,7 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
@ -87,8 +88,6 @@ import common.block.tech.BlockTorch;
import common.block.tech.BlockTripWire;
import common.block.tech.BlockTripWireHook;
import common.block.tech.BlockWarpChest;
import common.block.tile.BlockBannerHanging;
import common.block.tile.BlockBannerStanding;
import common.block.tile.BlockStandingSign;
import common.block.tile.BlockWallSign;
import common.collect.Lists;
@ -115,7 +114,6 @@ import common.log.Log;
import common.rng.Random;
import common.tags.TagObject;
import common.tileentity.TileEntity;
import common.tileentity.TileEntityBanner;
import common.tileentity.TileEntityBeacon;
import common.tileentity.TileEntityChest;
import common.tileentity.TileEntityComparator;
@ -385,7 +383,8 @@ public abstract class Converter {
mapTile(TileEntityDaylightDetector.class, "DLDetector", "daylight_detector");
mapTile(TileEntityHopper.class, "Hopper", "hopper");
mapTile(TileEntityComparator.class, "Comparator", "comparator");
mapTile(TileEntityBanner.class, "Banner", "banner");
Arrays.fill(BLOCK_MAP, Blocks.air.getState());
mapBlock(Blocks.stone, 1);
mapBlock(Blocks.rock, 1, 1);
@ -1439,26 +1438,6 @@ public abstract class Converter {
mapBlock(Blocks.large_fern, 175, 3);
mapBlock(Blocks.rose_bush, 175, 4);
mapBlock(Blocks.paeonia, 175, 5);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 0), 176, 0);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 1), 176, 1);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 2), 176, 2);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 3), 176, 3);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 4), 176, 4);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 5), 176, 5);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 6), 176, 6);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 7), 176, 7);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 8), 176, 8);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 9), 176, 9);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 10), 176, 10);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 11), 176, 11);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 12), 176, 12);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 13), 176, 13);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 14), 176, 14);
mapBlock(Blocks.banner.getState().withProperty(BlockBannerStanding.ROTATION, 15), 176, 15);
mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.NORTH), 177);
mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.SOUTH), 177, 3, 9, 15);
mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.WEST), 177, 4, 10);
mapBlock(Blocks.wall_banner.getState().withProperty(BlockBannerHanging.FACING, Facing.EAST), 177, 5, 11);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 0), 178, 0);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 1), 178, 1);
mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 2), 178, 2);

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

@ -83,7 +83,7 @@ public class Region {
mapping.put(bid, id);
highest = bid > highest ? bid : highest;
missing.remove(id);
Log.IO.debug("Geänderte Block-ID %d = %s -> %s", (int)bid, oid, id);
Log.IO.debug((id.equals(oid) ? "Mehrfache" : "Geänderte") + " Block-ID %d = %s -> %s", (int)bid, oid, id);
}
else {
Log.IO.debug("Entfernte Block-ID %d = %s", (int)bid, oid);