mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-16 07:35:35 +01:00
0f2c274998
Improves performance by keying every chunk thats part of a structure to a hashmap instead of only the first one. This allows us to avoid iterating the entire structures value set to see if a block position is inside of a structure. This should have pretty decent performance improvement to any standard world that has been around for a whilewith lots of structures due to ineffeciencies in how MC stores structures (even unloaded chunks has structured data loaded)
109 lines
2.5 KiB
Bash
Executable File
109 lines
2.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
(
|
|
set -e
|
|
nms="net/minecraft/server"
|
|
export MODLOG=""
|
|
PS1="$"
|
|
basedir="$(cd "$1" && pwd -P)"
|
|
|
|
workdir="$basedir/work"
|
|
minecraftversion=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
|
|
decompiledir="$workdir/Minecraft/$minecraftversion"
|
|
|
|
export importedmcdev=""
|
|
function import {
|
|
export importedmcdev="$importedmcdev $1"
|
|
file="${1}.java"
|
|
target="$workdir/Spigot/Spigot-Server/src/main/java/$nms/$file"
|
|
base="$decompiledir/$nms/$file"
|
|
|
|
if [[ ! -f "$target" ]]; then
|
|
export MODLOG="$MODLOG Imported $file from mc-dev\n";
|
|
echo "Copying $base to $target"
|
|
cp "$base" "$target"
|
|
else
|
|
echo "UN-NEEDED IMPORT: $file"
|
|
fi
|
|
}
|
|
|
|
(
|
|
cd "$workdir/Spigot/Spigot-Server/"
|
|
lastlog=$(git log -1 --oneline)
|
|
if [[ "$lastlog" = *"mc-dev Imports"* ]]; then
|
|
git reset --hard HEAD^
|
|
fi
|
|
)
|
|
|
|
import AxisAlignedBB
|
|
import BaseBlockPosition
|
|
import BiomeBase
|
|
import BiomeJungle
|
|
import BiomeMesa
|
|
import BlockBeacon
|
|
import BlockChest
|
|
import BlockFalling
|
|
import BlockFurnace
|
|
import BlockIceFrost
|
|
import BlockPosition
|
|
import BlockSnowBlock
|
|
import BlockStateEnum
|
|
import ChunkCache
|
|
import ChunkCoordIntPair
|
|
import ChunkProviderFlat
|
|
import ChunkProviderGenerate
|
|
import ChunkProviderHell
|
|
import CommandAbstract
|
|
import CommandScoreboard
|
|
import CommandWhitelist
|
|
import ControllerJump
|
|
import DataBits
|
|
import DataConverterMaterialId
|
|
import DataInspectorBlockEntity
|
|
import DataPalette
|
|
import DefinedStructure
|
|
import EntityLlama
|
|
import EntitySquid
|
|
import EntityTypes
|
|
import EntityWaterAnimal
|
|
import EnumItemSlot
|
|
import EULA
|
|
import FileIOThread
|
|
import IHopper
|
|
import ItemBlock
|
|
import ItemFireworks
|
|
import ItemMonsterEgg
|
|
import NavigationAbstract
|
|
import NBTTagCompound
|
|
import NBTTagList
|
|
import PacketPlayInUseEntity
|
|
import PacketPlayOutMapChunk
|
|
import PacketPlayOutPlayerListHeaderFooter
|
|
import PacketPlayOutScoreboardTeam
|
|
import PacketPlayOutTitle
|
|
import PacketPlayOutUpdateTime
|
|
import PathfinderAbstract
|
|
import PathfinderGoal
|
|
import PathfinderGoalFloat
|
|
import PathfinderGoalGotoTarget
|
|
import PathfinderWater
|
|
import PersistentScoreboard
|
|
import PersistentVillage
|
|
import PlayerConnectionUtils
|
|
import RegionFile
|
|
import RegistryBlockID
|
|
import RemoteControlListener
|
|
import StructureBoundingBox
|
|
import StructurePiece
|
|
import StructureStart
|
|
import TileEntityEnderChest
|
|
import TileEntityLootable
|
|
import WorldGenStronghold
|
|
import WorldProvider
|
|
|
|
cd "$workdir/Spigot/Spigot-Server/"
|
|
rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1
|
|
git add . -A >/dev/null 2>&1
|
|
echo -e "mc-dev Imports\n\n$MODLOG" | git commit . -F -
|
|
)
|