Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-25 02:20:07 +01:00
Update to 1.20 (#2276)
* Towards 1.20 * Init bukkit * Update YAML to 2.0 * Fixes for 1.20 adapters * Update obfuscated field names * Remove getHandle workaround * entityManager is obfuscated * Update paperweight * [ci-skip] Add 1.20 to modrinth task --------- Co-authored-by: Phillipp Glanz <p.glanz@madfix.me> Co-authored-by: SirYwell <hannesgreule@outlook.de>
Dieser Commit ist enthalten in:
Ursprung
152d870cdb
Commit
e7876c4eba
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@ -27,6 +27,7 @@ body:
|
|||||||
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
|
||||||
multiple: false
|
multiple: false
|
||||||
options:
|
options:
|
||||||
|
- '1.20'
|
||||||
- '1.19.4'
|
- '1.19.4'
|
||||||
- '1.19.3'
|
- '1.19.3'
|
||||||
- '1.19.2'
|
- '1.19.2'
|
||||||
|
15
.github/workflows/build.yml
vendored
15
.github/workflows/build.yml
vendored
@ -76,18 +76,3 @@ jobs:
|
|||||||
run: ./gradlew modrinth
|
run: ./gradlew modrinth
|
||||||
env:
|
env:
|
||||||
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
|
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
|
||||||
- name: Publish to CurseForge
|
|
||||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
|
||||||
uses: itsmeow/curseforge-upload@v3
|
|
||||||
with:
|
|
||||||
file_path: worldedit-bukkit/build/libs/FastAsyncWorldEdit-Bukkit-${{ github.event.release.tag_name }}.jar
|
|
||||||
# https://minecraft.curseforge.com/api/game/versions?token=redacted
|
|
||||||
# gameVersionTypeID: 1
|
|
||||||
game_versions: "8503,9016,9190,9261,9560,9561"
|
|
||||||
project_id: 103525
|
|
||||||
game_endpoint: minecraft
|
|
||||||
token: ${{ secrets.CURSEFORGE_TOKEN }}
|
|
||||||
display_name: FastAsyncWorldEdit ${{ github.event.release.tag_name }}
|
|
||||||
release_type: release
|
|
||||||
changelog: "Click here to view changelog: https://github.com/IntellectualSites/FastAsyncWorldEdit/releases/tag/${{ github.event.release.tag_name }}"
|
|
||||||
changelog_type: markdown
|
|
||||||
|
@ -83,7 +83,7 @@ allprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
applyCommonConfiguration()
|
applyCommonConfiguration()
|
||||||
val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4")
|
val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20")
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
supportedVersions.forEach {
|
supportedVersions.forEach {
|
||||||
|
@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
|
|||||||
|
|
||||||
include("worldedit-libs")
|
include("worldedit-libs")
|
||||||
|
|
||||||
listOf("legacy", "1_17_1", "1_18_2", "1_19", "1_19_3","1_19_4").forEach {
|
listOf("legacy", "1_17_1", "1_18_2", "1_19", "1_19_3","1_19_4", "1_20").forEach {
|
||||||
include("worldedit-bukkit:adapters:adapter-$it")
|
include("worldedit-bukkit:adapters:adapter-$it")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -11,6 +11,6 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230601.025018-99")
|
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230608.201059-104")
|
||||||
compileOnly("io.papermc:paperlib")
|
compileOnly("io.papermc:paperlib")
|
||||||
}
|
}
|
||||||
|
@ -109,12 +109,6 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
|
|||||||
private static final MethodHandle methodRemoveGameEventListener;
|
private static final MethodHandle methodRemoveGameEventListener;
|
||||||
private static final MethodHandle methodremoveTickingBlockEntity;
|
private static final MethodHandle methodremoveTickingBlockEntity;
|
||||||
|
|
||||||
/*
|
|
||||||
* This is a workaround for the changes from https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1fddefce1cdce44010927b888432bf70c0e88cde#src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
|
||||||
* and is only needed to support 1.19.4 versions before *and* after this change.
|
|
||||||
*/
|
|
||||||
private static final MethodHandle CRAFT_CHUNK_GET_HANDLE;
|
|
||||||
|
|
||||||
private static final Field fieldRemove;
|
private static final Field fieldRemove;
|
||||||
|
|
||||||
static final boolean POST_CHUNK_REWRITE;
|
static final boolean POST_CHUNK_REWRITE;
|
||||||
@ -220,20 +214,6 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
|
|||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
MethodHandle craftChunkGetHandle;
|
|
||||||
final MethodType type = methodType(LevelChunk.class);
|
|
||||||
try {
|
|
||||||
craftChunkGetHandle = lookup.findVirtual(CraftChunk.class, "getHandle", type);
|
|
||||||
} catch (NoSuchMethodException | IllegalAccessException e) {
|
|
||||||
try {
|
|
||||||
final MethodType newType = methodType(ChunkAccess.class, ChunkStatus.class);
|
|
||||||
craftChunkGetHandle = lookup.findVirtual(CraftChunk.class, "getHandle", newType);
|
|
||||||
craftChunkGetHandle = MethodHandles.insertArguments(craftChunkGetHandle, 1, ChunkStatus.FULL);
|
|
||||||
} catch (NoSuchMethodException | IllegalAccessException ex) {
|
|
||||||
throw new RuntimeException(ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CRAFT_CHUNK_GET_HANDLE = craftChunkGetHandle;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean setSectionAtomic(
|
static boolean setSectionAtomic(
|
||||||
@ -309,7 +289,7 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
|
|||||||
try {
|
try {
|
||||||
CraftChunk chunk = (CraftChunk) future.get();
|
CraftChunk chunk = (CraftChunk) future.get();
|
||||||
addTicket(serverLevel, chunkX, chunkZ);
|
addTicket(serverLevel, chunkX, chunkZ);
|
||||||
return (LevelChunk) CRAFT_CHUNK_GET_HANDLE.invoke(chunk);
|
return (LevelChunk) chunk.getHandle(ChunkStatus.FULL);
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
17
worldedit-bukkit/adapters/adapter-1_20/build.gradle.kts
Normale Datei
17
worldedit-bukkit/adapters/adapter-1_20/build.gradle.kts
Normale Datei
@ -0,0 +1,17 @@
|
|||||||
|
import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
java
|
||||||
|
}
|
||||||
|
|
||||||
|
applyPaperweightAdapterConfiguration()
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
|
||||||
|
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20-R0.1-20230609.070122-4")
|
||||||
|
compileOnly("io.papermc:paperlib")
|
||||||
|
}
|
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -0,0 +1,93 @@
|
|||||||
|
/*
|
||||||
|
* WorldEdit, a Minecraft world manipulation toolkit
|
||||||
|
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||||
|
* Copyright (C) WorldEdit team and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.sk89q.worldedit.bukkit.adapter.ext.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.mojang.authlib.GameProfile;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.stats.Stat;
|
||||||
|
import net.minecraft.world.MenuProvider;
|
||||||
|
import net.minecraft.world.damagesource.DamageSource;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.level.block.entity.SignBlockEntity;
|
||||||
|
import net.minecraft.world.phys.Vec3;
|
||||||
|
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
||||||
|
|
||||||
|
import java.util.OptionalInt;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
class PaperweightFakePlayer extends ServerPlayer {
|
||||||
|
private static final GameProfile FAKE_WORLDEDIT_PROFILE = new GameProfile(UUID.nameUUIDFromBytes("worldedit".getBytes()), "[WorldEdit]");
|
||||||
|
private static final Vec3 ORIGIN = new Vec3(0.0D, 0.0D, 0.0D);
|
||||||
|
|
||||||
|
PaperweightFakePlayer(ServerLevel world) {
|
||||||
|
super(world.getServer(), world, FAKE_WORLDEDIT_PROFILE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vec3 position() {
|
||||||
|
return ORIGIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void die(DamageSource damagesource) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Entity changeDimension(ServerLevel worldserver, TeleportCause cause) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public OptionalInt openMenu(MenuProvider factory) {
|
||||||
|
return OptionalInt.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateOptions(ServerboundClientInformationPacket packet) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayClientMessage(Component message, boolean actionBar) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void awardStat(Stat<?> stat, int amount) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void awardStat(Stat<?> stat) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isInvulnerableTo(DamageSource damageSource) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void openTextEdit(SignBlockEntity sign, boolean front) {
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,181 @@
|
|||||||
|
/*
|
||||||
|
* WorldEdit, a Minecraft world manipulation toolkit
|
||||||
|
* Copyright (C) sk89q <http://www.sk89q.com>
|
||||||
|
* Copyright (C) WorldEdit team and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.sk89q.worldedit.bukkit.adapter.ext.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
|
||||||
|
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
|
||||||
|
import com.sk89q.worldedit.util.SideEffect;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.server.level.FullChunkStatus;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
|
||||||
|
import org.bukkit.event.block.BlockPhysicsEvent;
|
||||||
|
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.util.Objects;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
public class PaperweightWorldNativeAccess implements WorldNativeAccess<LevelChunk, net.minecraft.world.level.block.state.BlockState, BlockPos> {
|
||||||
|
private static final int UPDATE = 1;
|
||||||
|
private static final int NOTIFY = 2;
|
||||||
|
|
||||||
|
private final PaperweightAdapter adapter;
|
||||||
|
private final WeakReference<ServerLevel> world;
|
||||||
|
private SideEffectSet sideEffectSet;
|
||||||
|
|
||||||
|
public PaperweightWorldNativeAccess(PaperweightAdapter adapter, WeakReference<ServerLevel> world) {
|
||||||
|
this.adapter = adapter;
|
||||||
|
this.world = world;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ServerLevel getWorld() {
|
||||||
|
return Objects.requireNonNull(world.get(), "The reference to the world was lost");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCurrentSideEffectSet(SideEffectSet sideEffectSet) {
|
||||||
|
this.sideEffectSet = sideEffectSet;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LevelChunk getChunk(int x, int z) {
|
||||||
|
return getWorld().getChunk(x, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState toNative(BlockState state) {
|
||||||
|
int stateId = BlockStateIdAccess.getBlockStateId(state);
|
||||||
|
return BlockStateIdAccess.isValidInternalId(stateId)
|
||||||
|
? Block.stateById(stateId)
|
||||||
|
: ((CraftBlockData) BukkitAdapter.adapt(state)).getState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState getBlockState(LevelChunk chunk, BlockPos position) {
|
||||||
|
return chunk.getBlockState(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState setBlockState(LevelChunk chunk, BlockPos position, net.minecraft.world.level.block.state.BlockState state) {
|
||||||
|
return chunk.setBlockState(position, state, false, this.sideEffectSet.shouldApply(SideEffect.UPDATE));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState getValidBlockForPosition(net.minecraft.world.level.block.state.BlockState block, BlockPos position) {
|
||||||
|
return Block.updateFromNeighbourShapes(block, getWorld(), position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockPos getPosition(int x, int y, int z) {
|
||||||
|
return new BlockPos(x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateLightingForBlock(BlockPos position) {
|
||||||
|
getWorld().getChunkSource().getLightEngine().checkBlock(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateTileEntity(BlockPos position, CompoundBinaryTag tag) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void notifyBlockUpdate(LevelChunk chunk, BlockPos position, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState) {
|
||||||
|
if (chunk.getSections()[getWorld().getSectionIndex(position.getY())] != null) {
|
||||||
|
getWorld().sendBlockUpdated(position, oldState, newState, UPDATE | NOTIFY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChunkTicking(LevelChunk chunk) {
|
||||||
|
return chunk.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void markBlockChanged(LevelChunk chunk, BlockPos position) {
|
||||||
|
if (chunk.getSections()[getWorld().getSectionIndex(position.getY())] != null) {
|
||||||
|
getWorld().getChunkSource().blockChanged(position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void notifyNeighbors(BlockPos pos, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState) {
|
||||||
|
ServerLevel world = getWorld();
|
||||||
|
if (sideEffectSet.shouldApply(SideEffect.EVENTS)) {
|
||||||
|
world.updateNeighborsAt(pos, oldState.getBlock());
|
||||||
|
} else {
|
||||||
|
// When we don't want events, manually run the physics without them.
|
||||||
|
Block block = oldState.getBlock();
|
||||||
|
fireNeighborChanged(pos, world, block, pos.west());
|
||||||
|
fireNeighborChanged(pos, world, block, pos.east());
|
||||||
|
fireNeighborChanged(pos, world, block, pos.below());
|
||||||
|
fireNeighborChanged(pos, world, block, pos.above());
|
||||||
|
fireNeighborChanged(pos, world, block, pos.north());
|
||||||
|
fireNeighborChanged(pos, world, block, pos.south());
|
||||||
|
}
|
||||||
|
if (newState.hasAnalogOutputSignal()) {
|
||||||
|
world.updateNeighbourForOutputSignal(pos, newState.getBlock());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not sure why neighborChanged is deprecated
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
private void fireNeighborChanged(BlockPos pos, ServerLevel world, Block block, BlockPos neighborPos) {
|
||||||
|
world.getBlockState(neighborPos).neighborChanged(world, neighborPos, block, pos, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateNeighbors(BlockPos pos, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState, int recursionLimit) {
|
||||||
|
ServerLevel world = getWorld();
|
||||||
|
// a == updateNeighbors
|
||||||
|
// b == updateDiagonalNeighbors
|
||||||
|
oldState.updateIndirectNeighbourShapes(world, pos, NOTIFY, recursionLimit);
|
||||||
|
if (sideEffectSet.shouldApply(SideEffect.EVENTS)) {
|
||||||
|
CraftWorld craftWorld = world.getWorld();
|
||||||
|
BlockPhysicsEvent event = new BlockPhysicsEvent(craftWorld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), CraftBlockData.fromData(newState));
|
||||||
|
world.getCraftServer().getPluginManager().callEvent(event);
|
||||||
|
if (event.isCancelled()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newState.updateNeighbourShapes(world, pos, NOTIFY, recursionLimit);
|
||||||
|
newState.updateIndirectNeighbourShapes(world, pos, NOTIFY, recursionLimit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBlockStateChange(BlockPos pos, net.minecraft.world.level.block.state.BlockState oldState, net.minecraft.world.level.block.state.BlockState newState) {
|
||||||
|
getWorld().onBlockStateChange(pos, oldState, newState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void flush() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,185 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.google.common.base.Suppliers;
|
||||||
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
|
import com.sk89q.util.ReflectionUtil;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.Refraction;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.nbt.PaperweightLazyCompoundTag;
|
||||||
|
import com.sk89q.worldedit.world.registry.BlockMaterial;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.level.EmptyBlockGetter;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.EntityBlock;
|
||||||
|
import net.minecraft.world.level.block.LiquidBlock;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.material.PushReaction;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
|
||||||
|
|
||||||
|
public class PaperweightBlockMaterial implements BlockMaterial {
|
||||||
|
|
||||||
|
private final Block block;
|
||||||
|
private final BlockState blockState;
|
||||||
|
private final boolean isTranslucent;
|
||||||
|
private final CraftBlockData craftBlockData;
|
||||||
|
private final org.bukkit.Material craftMaterial;
|
||||||
|
private final int opacity;
|
||||||
|
private final CompoundTag tile;
|
||||||
|
|
||||||
|
public PaperweightBlockMaterial(Block block) {
|
||||||
|
this(block, block.defaultBlockState());
|
||||||
|
}
|
||||||
|
|
||||||
|
public PaperweightBlockMaterial(Block block, BlockState blockState) {
|
||||||
|
this.block = block;
|
||||||
|
this.blockState = blockState;
|
||||||
|
this.craftBlockData = CraftBlockData.fromData(blockState);
|
||||||
|
this.craftMaterial = craftBlockData.getMaterial();
|
||||||
|
BlockBehaviour.Properties blockInfo = ReflectionUtil.getField(BlockBehaviour.class, block,
|
||||||
|
Refraction.pickName("properties", "aN"));
|
||||||
|
this.isTranslucent = !(boolean) ReflectionUtil.getField(BlockBehaviour.Properties.class, blockInfo,
|
||||||
|
Refraction.pickName("canOcclude", "m")
|
||||||
|
);
|
||||||
|
opacity = blockState.getLightBlock(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
|
||||||
|
BlockEntity tileEntity = !(block instanceof EntityBlock) ? null : ((EntityBlock) block).newBlockEntity(
|
||||||
|
BlockPos.ZERO,
|
||||||
|
blockState
|
||||||
|
);
|
||||||
|
tile = tileEntity == null
|
||||||
|
? null
|
||||||
|
: new PaperweightLazyCompoundTag(Suppliers.memoize(tileEntity::saveWithId));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Block getBlock() {
|
||||||
|
return block;
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState getState() {
|
||||||
|
return blockState;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CraftBlockData getCraftBlockData() {
|
||||||
|
return craftBlockData;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAir() {
|
||||||
|
return blockState.isAir();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isFullCube() {
|
||||||
|
return craftMaterial.isOccluding();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isOpaque() {
|
||||||
|
return blockState.isOpaque();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isPowerSource() {
|
||||||
|
return blockState.isSignalSource();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isLiquid() {
|
||||||
|
// TODO: Better check ?
|
||||||
|
return block instanceof LiquidBlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSolid() {
|
||||||
|
// TODO: Replace
|
||||||
|
return blockState.isSolid();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getHardness() {
|
||||||
|
return craftBlockData.getState().destroySpeed;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getResistance() {
|
||||||
|
return block.getExplosionResistance();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float getSlipperiness() {
|
||||||
|
return block.getFriction();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getLightValue() {
|
||||||
|
return blockState.getLightEmission();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getLightOpacity() {
|
||||||
|
return opacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isFragileWhenPushed() {
|
||||||
|
return blockState.getPistonPushReaction() == PushReaction.DESTROY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isUnpushable() {
|
||||||
|
return blockState.getPistonPushReaction() == PushReaction.BLOCK;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isTicksRandomly() {
|
||||||
|
return block.isRandomlyTicking(blockState);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isMovementBlocker() {
|
||||||
|
return craftMaterial.isSolid();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isBurnable() {
|
||||||
|
return craftMaterial.isBurnable();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isToolRequired() {
|
||||||
|
// Removed in 1.16.1, this is not present in higher versions
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isReplacedDuringPlacement() {
|
||||||
|
return blockState.canBeReplaced();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isTranslucent() {
|
||||||
|
return isTranslucent;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasContainer() {
|
||||||
|
return block instanceof EntityBlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isTile() {
|
||||||
|
return block instanceof EntityBlock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundTag getDefaultTile() {
|
||||||
|
return tile;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMapColor() {
|
||||||
|
// rgb field
|
||||||
|
return block.defaultMapColor().col;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,652 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.CachedBukkitAdapter;
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.IDelegateBukkitImplAdapter;
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.NMSRelighterFactory;
|
||||||
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
|
import com.fastasyncworldedit.core.entity.LazyBaseEntity;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
|
import com.fastasyncworldedit.core.queue.IBatchProcessor;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
|
import com.fastasyncworldedit.core.queue.implementation.packet.ChunkPacket;
|
||||||
|
import com.fastasyncworldedit.core.util.NbtUtils;
|
||||||
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
|
import com.google.common.base.Preconditions;
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.google.common.collect.ImmutableMap;
|
||||||
|
import com.sk89q.jnbt.Tag;
|
||||||
|
import com.sk89q.worldedit.EditSession;
|
||||||
|
import com.sk89q.worldedit.blocks.BaseItemStack;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.ext.fawe.v1_20_R1.PaperweightAdapter;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.nbt.PaperweightLazyCompoundTag;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.regen.PaperweightRegen;
|
||||||
|
import com.sk89q.worldedit.entity.BaseEntity;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
|
||||||
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
|
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
|
||||||
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
import com.sk89q.worldedit.regions.Region;
|
||||||
|
import com.sk89q.worldedit.registry.state.BooleanProperty;
|
||||||
|
import com.sk89q.worldedit.registry.state.DirectionalProperty;
|
||||||
|
import com.sk89q.worldedit.registry.state.EnumProperty;
|
||||||
|
import com.sk89q.worldedit.registry.state.IntegerProperty;
|
||||||
|
import com.sk89q.worldedit.registry.state.Property;
|
||||||
|
import com.sk89q.worldedit.util.Direction;
|
||||||
|
import com.sk89q.worldedit.util.SideEffect;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
|
import com.sk89q.worldedit.util.TreeGenerator;
|
||||||
|
import com.sk89q.worldedit.util.formatting.text.Component;
|
||||||
|
import com.sk89q.worldedit.util.nbt.BinaryTag;
|
||||||
|
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||||
|
import com.sk89q.worldedit.util.nbt.StringBinaryTag;
|
||||||
|
import com.sk89q.worldedit.world.RegenOptions;
|
||||||
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockStateHolder;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockType;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
|
import com.sk89q.worldedit.world.entity.EntityType;
|
||||||
|
import com.sk89q.worldedit.world.item.ItemType;
|
||||||
|
import com.sk89q.worldedit.world.registry.BlockMaterial;
|
||||||
|
import io.papermc.lib.PaperLib;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.core.WritableRegistry;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.dedicated.DedicatedServer;
|
||||||
|
import net.minecraft.server.level.ChunkHolder;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.util.StringRepresentable;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||||
|
import net.minecraft.world.level.block.state.properties.DirectionProperty;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.NamespacedKey;
|
||||||
|
import org.bukkit.TreeType;
|
||||||
|
import org.bukkit.block.data.BlockData;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.block.CraftBlockState;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.entity.CraftPlayer;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.util.CraftNamespacedKey;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.OptionalInt;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
import static net.minecraft.core.registries.Registries.BIOME;
|
||||||
|
|
||||||
|
public final class PaperweightFaweAdapter extends CachedBukkitAdapter implements
|
||||||
|
IDelegateBukkitImplAdapter<net.minecraft.nbt.Tag> {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LogManagerCompat.getLogger();
|
||||||
|
private static Method CHUNK_HOLDER_WAS_ACCESSIBLE_SINCE_LAST_SAVE;
|
||||||
|
|
||||||
|
static {
|
||||||
|
try {
|
||||||
|
CHUNK_HOLDER_WAS_ACCESSIBLE_SINCE_LAST_SAVE = ChunkHolder.class.getDeclaredMethod("wasAccessibleSinceLastSave");
|
||||||
|
} catch (NoSuchMethodException ignored) { // may not be present in newer paper versions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private final PaperweightAdapter parent;
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
// Code that may break between versions of Minecraft
|
||||||
|
// ------------------------------------------------------------------------
|
||||||
|
private final PaperweightMapChunkUtil mapUtil = new PaperweightMapChunkUtil();
|
||||||
|
private char[] ibdToStateOrdinal = null;
|
||||||
|
private int[] ordinalToIbdID = null;
|
||||||
|
private boolean initialised = false;
|
||||||
|
private Map<String, List<Property<?>>> allBlockProperties = null;
|
||||||
|
|
||||||
|
public PaperweightFaweAdapter() throws NoSuchFieldException, NoSuchMethodException {
|
||||||
|
this.parent = new PaperweightAdapter();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
private static String getEntityId(Entity entity) {
|
||||||
|
ResourceLocation resourceLocation = net.minecraft.world.entity.EntityType.getKey(entity.getType());
|
||||||
|
return resourceLocation == null ? null : resourceLocation.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
|
||||||
|
entity.save(compoundTag);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BukkitImplAdapter<net.minecraft.nbt.Tag> getParent() {
|
||||||
|
return parent;
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized boolean init() {
|
||||||
|
if (ibdToStateOrdinal != null && ibdToStateOrdinal[1] != 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
ibdToStateOrdinal = new char[BlockTypesCache.states.length]; // size
|
||||||
|
ordinalToIbdID = new int[ibdToStateOrdinal.length]; // size
|
||||||
|
for (int i = 0; i < ibdToStateOrdinal.length; i++) {
|
||||||
|
BlockState blockState = BlockTypesCache.states[i];
|
||||||
|
PaperweightBlockMaterial material = (PaperweightBlockMaterial) blockState.getMaterial();
|
||||||
|
int id = Block.BLOCK_STATE_REGISTRY.getId(material.getState());
|
||||||
|
char ordinal = blockState.getOrdinalChar();
|
||||||
|
ibdToStateOrdinal[id] = ordinal;
|
||||||
|
ordinalToIbdID[ordinal] = id;
|
||||||
|
}
|
||||||
|
Map<String, List<Property<?>>> properties = new HashMap<>();
|
||||||
|
try {
|
||||||
|
for (Field field : BlockStateProperties.class.getDeclaredFields()) {
|
||||||
|
Object obj = field.get(null);
|
||||||
|
if (!(obj instanceof net.minecraft.world.level.block.state.properties.Property<?> state)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Property<?> property;
|
||||||
|
if (state instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) {
|
||||||
|
property = new BooleanProperty(
|
||||||
|
state.getName(),
|
||||||
|
(List<Boolean>) ImmutableList.copyOf(state.getPossibleValues())
|
||||||
|
);
|
||||||
|
} else if (state instanceof DirectionProperty) {
|
||||||
|
property = new DirectionalProperty(
|
||||||
|
state.getName(),
|
||||||
|
state
|
||||||
|
.getPossibleValues()
|
||||||
|
.stream()
|
||||||
|
.map(e -> Direction.valueOf(((StringRepresentable) e).getSerializedName().toUpperCase()))
|
||||||
|
.collect(Collectors.toList())
|
||||||
|
);
|
||||||
|
} else if (state instanceof net.minecraft.world.level.block.state.properties.EnumProperty) {
|
||||||
|
property = new EnumProperty(
|
||||||
|
state.getName(),
|
||||||
|
state
|
||||||
|
.getPossibleValues()
|
||||||
|
.stream()
|
||||||
|
.map(e -> ((StringRepresentable) e).getSerializedName())
|
||||||
|
.collect(Collectors.toList())
|
||||||
|
);
|
||||||
|
} else if (state instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) {
|
||||||
|
property = new IntegerProperty(
|
||||||
|
state.getName(),
|
||||||
|
(List<Integer>) ImmutableList.copyOf(state.getPossibleValues())
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
throw new IllegalArgumentException("FastAsyncWorldEdit needs an update to support " + state
|
||||||
|
.getClass()
|
||||||
|
.getSimpleName());
|
||||||
|
}
|
||||||
|
properties.compute(property.getName().toLowerCase(Locale.ROOT), (k, v) -> {
|
||||||
|
if (v == null) {
|
||||||
|
v = new ArrayList<>(Collections.singletonList(property));
|
||||||
|
} else {
|
||||||
|
v.add(property);
|
||||||
|
}
|
||||||
|
return v;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
} finally {
|
||||||
|
allBlockProperties = ImmutableMap.copyOf(properties);
|
||||||
|
}
|
||||||
|
initialised = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockMaterial getMaterial(BlockType blockType) {
|
||||||
|
Block block = getBlock(blockType);
|
||||||
|
return new PaperweightBlockMaterial(block);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public synchronized BlockMaterial getMaterial(BlockState state) {
|
||||||
|
net.minecraft.world.level.block.state.BlockState blockState = ((CraftBlockData) Bukkit.createBlockData(state.getAsString())).getState();
|
||||||
|
return new PaperweightBlockMaterial(blockState.getBlock(), blockState);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Block getBlock(BlockType blockType) {
|
||||||
|
return DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.BLOCK)
|
||||||
|
.get(new ResourceLocation(blockType.getNamespace(), blockType.getResource()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
@Override
|
||||||
|
public BlockState getBlock(Location location) {
|
||||||
|
Preconditions.checkNotNull(location);
|
||||||
|
|
||||||
|
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||||
|
int x = location.getBlockX();
|
||||||
|
int y = location.getBlockY();
|
||||||
|
int z = location.getBlockZ();
|
||||||
|
final ServerLevel handle = craftWorld.getHandle();
|
||||||
|
LevelChunk chunk = handle.getChunk(x >> 4, z >> 4);
|
||||||
|
final BlockPos blockPos = new BlockPos(x, y, z);
|
||||||
|
final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(blockPos);
|
||||||
|
BlockState state = adapt(blockData);
|
||||||
|
if (state == null) {
|
||||||
|
org.bukkit.block.Block bukkitBlock = location.getBlock();
|
||||||
|
state = BukkitAdapter.adapt(bukkitBlock.getBlockData());
|
||||||
|
}
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock getFullBlock(final Location location) {
|
||||||
|
Preconditions.checkNotNull(location);
|
||||||
|
|
||||||
|
CraftWorld craftWorld = ((CraftWorld) location.getWorld());
|
||||||
|
int x = location.getBlockX();
|
||||||
|
int y = location.getBlockY();
|
||||||
|
int z = location.getBlockZ();
|
||||||
|
|
||||||
|
final ServerLevel handle = craftWorld.getHandle();
|
||||||
|
LevelChunk chunk = handle.getChunk(x >> 4, z >> 4);
|
||||||
|
final BlockPos blockPos = new BlockPos(x, y, z);
|
||||||
|
final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(blockPos);
|
||||||
|
BlockState state = adapt(blockData);
|
||||||
|
if (state == null) {
|
||||||
|
org.bukkit.block.Block bukkitBlock = location.getBlock();
|
||||||
|
state = BukkitAdapter.adapt(bukkitBlock.getBlockData());
|
||||||
|
}
|
||||||
|
if (state.getBlockType().getMaterial().hasContainer()) {
|
||||||
|
|
||||||
|
// Read the NBT data
|
||||||
|
BlockEntity blockEntity = chunk.getBlockEntity(blockPos, LevelChunk.EntityCreationType.CHECK);
|
||||||
|
if (blockEntity != null) {
|
||||||
|
net.minecraft.nbt.CompoundTag tag = blockEntity.saveWithId();
|
||||||
|
return state.toBaseBlock((CompoundBinaryTag) toNativeBinary(tag));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return state.toBaseBlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<SideEffect> getSupportedSideEffects() {
|
||||||
|
return SideEffectSet.defaults().getSideEffectsToApply();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public WorldNativeAccess<?, ?, ?> createWorldNativeAccess(org.bukkit.World world) {
|
||||||
|
return new PaperweightFaweWorldNativeAccess(
|
||||||
|
this,
|
||||||
|
new WeakReference<>(((CraftWorld) world).getHandle())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
|
||||||
|
Preconditions.checkNotNull(entity);
|
||||||
|
|
||||||
|
CraftEntity craftEntity = ((CraftEntity) entity);
|
||||||
|
Entity mcEntity = craftEntity.getHandle();
|
||||||
|
|
||||||
|
String id = getEntityId(mcEntity);
|
||||||
|
|
||||||
|
if (id != null) {
|
||||||
|
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
|
||||||
|
Supplier<CompoundBinaryTag> saveTag = () -> {
|
||||||
|
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
|
||||||
|
readEntityIntoTag(mcEntity, minecraftTag);
|
||||||
|
//add Id for AbstractChangeSet to work
|
||||||
|
final CompoundBinaryTag tag = (CompoundBinaryTag) toNativeBinary(minecraftTag);
|
||||||
|
final Map<String, BinaryTag> tags = NbtUtils.getCompoundBinaryTagValues(tag);
|
||||||
|
tags.put("Id", StringBinaryTag.of(id));
|
||||||
|
return CompoundBinaryTag.from(tags);
|
||||||
|
};
|
||||||
|
return new LazyBaseEntity(type, saveTag);
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Component getRichBlockName(BlockType blockType) {
|
||||||
|
return parent.getRichBlockName(blockType);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Component getRichItemName(ItemType itemType) {
|
||||||
|
return parent.getRichItemName(itemType);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Component getRichItemName(BaseItemStack itemStack) {
|
||||||
|
return parent.getRichItemName(itemStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public OptionalInt getInternalBlockStateId(BlockState state) {
|
||||||
|
PaperweightBlockMaterial material = (PaperweightBlockMaterial) state.getMaterial();
|
||||||
|
net.minecraft.world.level.block.state.BlockState mcState = material.getCraftBlockData().getState();
|
||||||
|
return OptionalInt.of(Block.BLOCK_STATE_REGISTRY.getId(mcState));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockState adapt(BlockData blockData) {
|
||||||
|
CraftBlockData cbd = ((CraftBlockData) blockData);
|
||||||
|
net.minecraft.world.level.block.state.BlockState ibd = cbd.getState();
|
||||||
|
return adapt(ibd);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockState adapt(net.minecraft.world.level.block.state.BlockState blockState) {
|
||||||
|
return BlockTypesCache.states[adaptToChar(blockState)];
|
||||||
|
}
|
||||||
|
|
||||||
|
public char adaptToChar(net.minecraft.world.level.block.state.BlockState blockState) {
|
||||||
|
int id = Block.BLOCK_STATE_REGISTRY.getId(blockState);
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
init();
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
} catch (ArrayIndexOutOfBoundsException e1) {
|
||||||
|
LOGGER.error("Attempted to convert {} with ID {} to char. ibdToStateOrdinal length: {}. Defaulting to air!",
|
||||||
|
blockState.getBlock(), Block.BLOCK_STATE_REGISTRY.getId(blockState), ibdToStateOrdinal.length, e1
|
||||||
|
);
|
||||||
|
return BlockTypesCache.ReservedIDs.AIR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public char ibdIDToOrdinal(int id) {
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
}
|
||||||
|
init();
|
||||||
|
return ibdToStateOrdinal[id];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public char[] getIbdToStateOrdinal() {
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal;
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return ibdToStateOrdinal;
|
||||||
|
}
|
||||||
|
init();
|
||||||
|
return ibdToStateOrdinal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int ordinalToIbdID(char ordinal) {
|
||||||
|
if (initialised) {
|
||||||
|
return ordinalToIbdID[ordinal];
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return ordinalToIbdID[ordinal];
|
||||||
|
}
|
||||||
|
init();
|
||||||
|
return ordinalToIbdID[ordinal];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int[] getOrdinalToIbdID() {
|
||||||
|
if (initialised) {
|
||||||
|
return ordinalToIbdID;
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return ordinalToIbdID;
|
||||||
|
}
|
||||||
|
init();
|
||||||
|
return ordinalToIbdID;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <B extends BlockStateHolder<B>> BlockData adapt(B state) {
|
||||||
|
PaperweightBlockMaterial material = (PaperweightBlockMaterial) state.getMaterial();
|
||||||
|
return material.getCraftBlockData();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void sendFakeChunk(org.bukkit.World world, Player player, ChunkPacket chunkPacket) {
|
||||||
|
ServerLevel nmsWorld = ((CraftWorld) world).getHandle();
|
||||||
|
ChunkHolder map = PaperweightPlatformAdapter.getPlayerChunk(nmsWorld, chunkPacket.getChunkX(), chunkPacket.getChunkZ());
|
||||||
|
if (map != null && wasAccessibleSinceLastSave(map)) {
|
||||||
|
boolean flag = false;
|
||||||
|
// PlayerChunk.d players = map.players;
|
||||||
|
Stream<ServerPlayer> stream = /*players.a(new ChunkCoordIntPair(packet.getChunkX(), packet.getChunkZ()), flag)
|
||||||
|
*/ Stream.empty();
|
||||||
|
|
||||||
|
ServerPlayer checkPlayer = player == null ? null : ((CraftPlayer) player).getHandle();
|
||||||
|
stream.filter(entityPlayer -> checkPlayer == null || entityPlayer == checkPlayer)
|
||||||
|
.forEach(entityPlayer -> {
|
||||||
|
synchronized (chunkPacket) {
|
||||||
|
ClientboundLevelChunkWithLightPacket nmsPacket = (ClientboundLevelChunkWithLightPacket) chunkPacket.getNativePacket();
|
||||||
|
if (nmsPacket == null) {
|
||||||
|
nmsPacket = mapUtil.create(this, chunkPacket);
|
||||||
|
chunkPacket.setNativePacket(nmsPacket);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
FaweCache.INSTANCE.CHUNK_FLAG.get().set(true);
|
||||||
|
entityPlayer.connection.send(nmsPacket);
|
||||||
|
} finally {
|
||||||
|
FaweCache.INSTANCE.CHUNK_FLAG.get().set(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, ? extends Property<?>> getProperties(BlockType blockType) {
|
||||||
|
return getParent().getProperties(blockType);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canPlaceAt(org.bukkit.World world, BlockVector3 blockVector3, BlockState blockState) {
|
||||||
|
int internalId = BlockStateIdAccess.getBlockStateId(blockState);
|
||||||
|
net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
|
||||||
|
return blockState1.hasPostProcess(
|
||||||
|
((CraftWorld) world).getHandle(),
|
||||||
|
new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
|
||||||
|
ItemStack stack = new ItemStack(
|
||||||
|
DedicatedServer.getServer().registryAccess().registryOrThrow(Registries.ITEM)
|
||||||
|
.get(ResourceLocation.tryParse(baseItemStack.getType().getId())),
|
||||||
|
baseItemStack.getAmount()
|
||||||
|
);
|
||||||
|
stack.setTag(((net.minecraft.nbt.CompoundTag) fromNative(baseItemStack.getNbtData())));
|
||||||
|
return CraftItemStack.asCraftMirror(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean generateTree(
|
||||||
|
TreeGenerator.TreeType treeType, EditSession editSession, BlockVector3 blockVector3,
|
||||||
|
org.bukkit.World bukkitWorld
|
||||||
|
) {
|
||||||
|
TreeType bukkitType = BukkitWorld.toBukkitTreeType(treeType);
|
||||||
|
if (bukkitType == TreeType.CHORUS_PLANT) {
|
||||||
|
blockVector3 = blockVector3.add(
|
||||||
|
0,
|
||||||
|
1,
|
||||||
|
0
|
||||||
|
); // bukkit skips the feature gen which does this offset normally, so we have to add it back
|
||||||
|
}
|
||||||
|
ServerLevel serverLevel = ((CraftWorld) bukkitWorld).getHandle();
|
||||||
|
final BlockVector3 finalBlockVector = blockVector3;
|
||||||
|
// Sync to main thread to ensure no clashes occur
|
||||||
|
Map<BlockPos, CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
|
||||||
|
serverLevel.captureTreeGeneration = true;
|
||||||
|
serverLevel.captureBlockStates = true;
|
||||||
|
try {
|
||||||
|
if (!bukkitWorld.generateTree(BukkitAdapter.adapt(bukkitWorld, finalBlockVector), bukkitType)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return ImmutableMap.copyOf(serverLevel.capturedBlockStates);
|
||||||
|
} finally {
|
||||||
|
serverLevel.captureBlockStates = false;
|
||||||
|
serverLevel.captureTreeGeneration = false;
|
||||||
|
serverLevel.capturedBlockStates.clear();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (placed == null || placed.isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (CraftBlockState craftBlockState : placed.values()) {
|
||||||
|
if (craftBlockState == null || craftBlockState.getType() == Material.AIR) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
editSession.setBlock(craftBlockState.getX(), craftBlockState.getY(), craftBlockState.getZ(),
|
||||||
|
BukkitAdapter.adapt(((org.bukkit.block.BlockState) craftBlockState).getBlockData())
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
|
||||||
|
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
|
||||||
|
final BaseItemStack weStack = new BaseItemStack(BukkitAdapter.asItemType(itemStack.getType()), itemStack.getAmount());
|
||||||
|
weStack.setNbt(((CompoundBinaryTag) toNativeBinary(nmsStack.getTag())));
|
||||||
|
return weStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Tag toNative(net.minecraft.nbt.Tag foreign) {
|
||||||
|
return parent.toNative(foreign);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.nbt.Tag fromNative(Tag foreign) {
|
||||||
|
if (foreign instanceof PaperweightLazyCompoundTag) {
|
||||||
|
return ((PaperweightLazyCompoundTag) foreign).get();
|
||||||
|
}
|
||||||
|
return parent.fromNative(foreign);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean regenerate(org.bukkit.World bukkitWorld, Region region, Extent target, RegenOptions options) throws Exception {
|
||||||
|
return new PaperweightRegen(bukkitWorld, region, target, options).regenerate();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IChunkGet get(org.bukkit.World world, int chunkX, int chunkZ) {
|
||||||
|
return new PaperweightGetBlocks(world, chunkX, chunkZ);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getInternalBiomeId(BiomeType biomeType) {
|
||||||
|
final Registry<Biome> registry = MinecraftServer
|
||||||
|
.getServer()
|
||||||
|
.registryAccess()
|
||||||
|
.registryOrThrow(BIOME);
|
||||||
|
ResourceLocation resourceLocation = ResourceLocation.tryParse(biomeType.getId());
|
||||||
|
Biome biome = registry.get(resourceLocation);
|
||||||
|
return registry.getId(biome);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Iterable<NamespacedKey> getRegisteredBiomes() {
|
||||||
|
WritableRegistry<Biome> biomeRegistry = (WritableRegistry<Biome>) ((CraftServer) Bukkit.getServer())
|
||||||
|
.getServer()
|
||||||
|
.registryAccess()
|
||||||
|
.registryOrThrow(BIOME);
|
||||||
|
List<ResourceLocation> keys = biomeRegistry.stream()
|
||||||
|
.map(biomeRegistry::getKey).filter(Objects::nonNull).toList();
|
||||||
|
List<NamespacedKey> namespacedKeys = new ArrayList<>();
|
||||||
|
for (ResourceLocation key : keys) {
|
||||||
|
try {
|
||||||
|
namespacedKeys.add(CraftNamespacedKey.fromMinecraft(key));
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
LOGGER.error("Error converting biome key {}", key.toString(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return namespacedKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RelighterFactory getRelighterFactory() {
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
return new PaperweightStarlightRelighterFactory();
|
||||||
|
} else {
|
||||||
|
return new NMSRelighterFactory();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, List<Property<?>>> getAllProperties() {
|
||||||
|
if (initialised) {
|
||||||
|
return allBlockProperties;
|
||||||
|
}
|
||||||
|
synchronized (this) {
|
||||||
|
if (initialised) {
|
||||||
|
return allBlockProperties;
|
||||||
|
}
|
||||||
|
init();
|
||||||
|
return allBlockProperties;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IBatchProcessor getTickingPostProcessor() {
|
||||||
|
return new PaperweightPostProcessor();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean wasAccessibleSinceLastSave(ChunkHolder holder) {
|
||||||
|
if (!PaperLib.isPaper() || !PaperweightPlatformAdapter.POST_CHUNK_REWRITE) {
|
||||||
|
try {
|
||||||
|
return (boolean) CHUNK_HOLDER_WAS_ACCESSIBLE_SINCE_LAST_SAVE.invoke(holder);
|
||||||
|
} catch (IllegalAccessException | InvocationTargetException ignored) {
|
||||||
|
// fall-through
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Papers new chunk system has no related replacement - therefor we assume true.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,287 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
|
import com.fastasyncworldedit.core.math.IntPair;
|
||||||
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
|
import com.fastasyncworldedit.core.util.task.RunnableVal;
|
||||||
|
import com.sk89q.worldedit.bukkit.BukkitAdapter;
|
||||||
|
import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
|
||||||
|
import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
|
||||||
|
import com.sk89q.worldedit.util.SideEffect;
|
||||||
|
import com.sk89q.worldedit.util.SideEffectSet;
|
||||||
|
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.level.ChunkHolder;
|
||||||
|
import net.minecraft.server.level.ServerChunkCache;
|
||||||
|
import net.minecraft.server.level.FullChunkStatus;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.block.data.CraftBlockData;
|
||||||
|
import org.bukkit.event.block.BlockPhysicsEvent;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
public class PaperweightFaweWorldNativeAccess implements WorldNativeAccess<LevelChunk,
|
||||||
|
net.minecraft.world.level.block.state.BlockState, BlockPos> {
|
||||||
|
|
||||||
|
private static final int UPDATE = 1;
|
||||||
|
private static final int NOTIFY = 2;
|
||||||
|
private static final Direction[] NEIGHBOUR_ORDER = {
|
||||||
|
Direction.EAST,
|
||||||
|
Direction.WEST,
|
||||||
|
Direction.DOWN,
|
||||||
|
Direction.UP,
|
||||||
|
Direction.NORTH,
|
||||||
|
Direction.SOUTH
|
||||||
|
};
|
||||||
|
private final PaperweightFaweAdapter paperweightFaweAdapter;
|
||||||
|
private final WeakReference<Level> level;
|
||||||
|
private final AtomicInteger lastTick;
|
||||||
|
private final Set<CachedChange> cachedChanges = new HashSet<>();
|
||||||
|
private final Set<IntPair> cachedChunksToSend = new HashSet<>();
|
||||||
|
private SideEffectSet sideEffectSet;
|
||||||
|
|
||||||
|
public PaperweightFaweWorldNativeAccess(PaperweightFaweAdapter paperweightFaweAdapter, WeakReference<Level> level) {
|
||||||
|
this.paperweightFaweAdapter = paperweightFaweAdapter;
|
||||||
|
this.level = level;
|
||||||
|
// Use the actual tick as minecraft-defined so we don't try to force blocks into the world when the server's already lagging.
|
||||||
|
// - With the caveat that we don't want to have too many cached changed (1024) so we'd flush those at 1024 anyway.
|
||||||
|
this.lastTick = new AtomicInteger(MinecraftServer.currentTick);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Level getLevel() {
|
||||||
|
return Objects.requireNonNull(level.get(), "The reference to the world was lost");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCurrentSideEffectSet(SideEffectSet sideEffectSet) {
|
||||||
|
this.sideEffectSet = sideEffectSet;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LevelChunk getChunk(int x, int z) {
|
||||||
|
return getLevel().getChunk(x, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState toNative(BlockState blockState) {
|
||||||
|
int stateId = paperweightFaweAdapter.ordinalToIbdID(blockState.getOrdinalChar());
|
||||||
|
return BlockStateIdAccess.isValidInternalId(stateId)
|
||||||
|
? Block.stateById(stateId)
|
||||||
|
: ((CraftBlockData) BukkitAdapter.adapt(blockState)).getState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState getBlockState(LevelChunk levelChunk, BlockPos blockPos) {
|
||||||
|
return levelChunk.getBlockState(blockPos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public synchronized net.minecraft.world.level.block.state.BlockState setBlockState(
|
||||||
|
LevelChunk levelChunk, BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState blockState
|
||||||
|
) {
|
||||||
|
int currentTick = MinecraftServer.currentTick;
|
||||||
|
if (Fawe.isMainThread()) {
|
||||||
|
return levelChunk.setBlockState(blockPos, blockState,
|
||||||
|
this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Since FAWE is.. Async we need to do it on the main thread (wooooo.. :( )
|
||||||
|
cachedChanges.add(new CachedChange(levelChunk, blockPos, blockState));
|
||||||
|
cachedChunksToSend.add(new IntPair(levelChunk.locX, levelChunk.locZ));
|
||||||
|
boolean nextTick = lastTick.get() > currentTick;
|
||||||
|
if (nextTick || cachedChanges.size() >= 1024) {
|
||||||
|
if (nextTick) {
|
||||||
|
lastTick.set(currentTick);
|
||||||
|
}
|
||||||
|
flushAsync(nextTick);
|
||||||
|
}
|
||||||
|
return blockState;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState getValidBlockForPosition(
|
||||||
|
net.minecraft.world.level.block.state.BlockState blockState,
|
||||||
|
BlockPos blockPos
|
||||||
|
) {
|
||||||
|
return Block.updateFromNeighbourShapes(blockState, getLevel(), blockPos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockPos getPosition(int x, int y, int z) {
|
||||||
|
return new BlockPos(x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateLightingForBlock(BlockPos blockPos) {
|
||||||
|
getLevel().getChunkSource().getLightEngine().checkBlock(blockPos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean updateTileEntity(BlockPos blockPos, CompoundBinaryTag tag) {
|
||||||
|
// We will assume that the tile entity was created for us,
|
||||||
|
// though we do not do this on the other versions
|
||||||
|
BlockEntity blockEntity = getLevel().getBlockEntity(blockPos);
|
||||||
|
if (blockEntity == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
net.minecraft.nbt.Tag nativeTag = paperweightFaweAdapter.fromNativeBinary(tag);
|
||||||
|
blockEntity.load((CompoundTag) nativeTag);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void notifyBlockUpdate(
|
||||||
|
LevelChunk levelChunk, BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState oldState,
|
||||||
|
net.minecraft.world.level.block.state.BlockState newState
|
||||||
|
) {
|
||||||
|
if (levelChunk.getSections()[level.get().getSectionIndex(blockPos.getY())] != null) {
|
||||||
|
getLevel().sendBlockUpdated(blockPos, oldState, newState, UPDATE | NOTIFY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isChunkTicking(LevelChunk levelChunk) {
|
||||||
|
return levelChunk.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void markBlockChanged(LevelChunk levelChunk, BlockPos blockPos) {
|
||||||
|
if (levelChunk.getSections()[level.get().getSectionIndex(blockPos.getY())] != null) {
|
||||||
|
((ServerChunkCache) getLevel().getChunkSource()).blockChanged(blockPos);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void notifyNeighbors(
|
||||||
|
BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState oldState,
|
||||||
|
net.minecraft.world.level.block.state.BlockState newState
|
||||||
|
) {
|
||||||
|
Level level = getLevel();
|
||||||
|
if (sideEffectSet.shouldApply(SideEffect.EVENTS)) {
|
||||||
|
level.blockUpdated(blockPos, oldState.getBlock());
|
||||||
|
} else {
|
||||||
|
// When we don't want events, manually run the physics without them.
|
||||||
|
// Un-nest neighbour updating
|
||||||
|
for (Direction direction : NEIGHBOUR_ORDER) {
|
||||||
|
BlockPos shifted = blockPos.relative(direction);
|
||||||
|
level.getBlockState(shifted).neighborChanged(level, shifted, oldState.getBlock(), blockPos, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (newState.hasAnalogOutputSignal()) {
|
||||||
|
level.updateNeighbourForOutputSignal(blockPos, newState.getBlock());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateNeighbors(
|
||||||
|
BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState oldState,
|
||||||
|
net.minecraft.world.level.block.state.BlockState newState,
|
||||||
|
int recursionLimit
|
||||||
|
) {
|
||||||
|
Level level = getLevel();
|
||||||
|
// a == updateNeighbors
|
||||||
|
// b == updateDiagonalNeighbors
|
||||||
|
oldState.updateIndirectNeighbourShapes(level, blockPos, NOTIFY, recursionLimit);
|
||||||
|
if (sideEffectSet.shouldApply(SideEffect.EVENTS)) {
|
||||||
|
CraftWorld craftWorld = level.getWorld();
|
||||||
|
if (craftWorld != null) {
|
||||||
|
BlockPhysicsEvent event = new BlockPhysicsEvent(
|
||||||
|
craftWorld.getBlockAt(blockPos.getX(), blockPos.getY(), blockPos.getZ()),
|
||||||
|
CraftBlockData.fromData(newState)
|
||||||
|
);
|
||||||
|
level.getCraftServer().getPluginManager().callEvent(event);
|
||||||
|
if (event.isCancelled()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newState.triggerEvent(level, blockPos, NOTIFY, recursionLimit);
|
||||||
|
newState.updateIndirectNeighbourShapes(level, blockPos, NOTIFY, recursionLimit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBlockStateChange(
|
||||||
|
BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState oldState,
|
||||||
|
net.minecraft.world.level.block.state.BlockState newState
|
||||||
|
) {
|
||||||
|
getLevel().onBlockStateChange(blockPos, oldState, newState);
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized void flushAsync(final boolean sendChunks) {
|
||||||
|
final Set<CachedChange> changes = Set.copyOf(cachedChanges);
|
||||||
|
cachedChanges.clear();
|
||||||
|
final Set<IntPair> toSend;
|
||||||
|
if (sendChunks) {
|
||||||
|
toSend = Set.copyOf(cachedChunksToSend);
|
||||||
|
cachedChunksToSend.clear();
|
||||||
|
} else {
|
||||||
|
toSend = Collections.emptySet();
|
||||||
|
}
|
||||||
|
RunnableVal<Object> runnableVal = new RunnableVal<>() {
|
||||||
|
@Override
|
||||||
|
public void run(Object value) {
|
||||||
|
changes.forEach(cc -> cc.levelChunk.setBlockState(cc.blockPos, cc.blockState,
|
||||||
|
sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)
|
||||||
|
));
|
||||||
|
if (!sendChunks) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (IntPair chunk : toSend) {
|
||||||
|
PaperweightPlatformAdapter.sendChunk(getLevel().getWorld().getHandle(), chunk.x(), chunk.z(), false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
TaskManager.taskManager().async(() -> TaskManager.taskManager().sync(runnableVal));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public synchronized void flush() {
|
||||||
|
RunnableVal<Object> runnableVal = new RunnableVal<>() {
|
||||||
|
@Override
|
||||||
|
public void run(Object value) {
|
||||||
|
cachedChanges.forEach(cc -> cc.levelChunk.setBlockState(cc.blockPos, cc.blockState,
|
||||||
|
sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)
|
||||||
|
));
|
||||||
|
for (IntPair chunk : cachedChunksToSend) {
|
||||||
|
PaperweightPlatformAdapter.sendChunk(getLevel().getWorld().getHandle(), chunk.x(), chunk.z(), false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if (Fawe.isMainThread()) {
|
||||||
|
runnableVal.run();
|
||||||
|
} else {
|
||||||
|
TaskManager.taskManager().sync(runnableVal);
|
||||||
|
}
|
||||||
|
cachedChanges.clear();
|
||||||
|
cachedChunksToSend.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
private record CachedChange(
|
||||||
|
LevelChunk levelChunk,
|
||||||
|
BlockPos blockPos,
|
||||||
|
net.minecraft.world.level.block.state.BlockState blockState
|
||||||
|
) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Datei-Diff unterdrückt, da er zu groß ist
Diff laden
@ -0,0 +1,248 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.heightmap.HeightMapType;
|
||||||
|
import com.fastasyncworldedit.core.queue.IBlocks;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkSet;
|
||||||
|
import com.google.common.base.Suppliers;
|
||||||
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.nbt.PaperweightLazyCompoundTag;
|
||||||
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
|
import com.sk89q.worldedit.math.BlockVector3;
|
||||||
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
|
import com.sk89q.worldedit.world.block.BaseBlock;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.chunk.PalettedContainer;
|
||||||
|
import net.minecraft.world.level.chunk.PalettedContainerRO;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.Future;
|
||||||
|
|
||||||
|
public class PaperweightGetBlocks_Copy implements IChunkGet {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LogManagerCompat.getLogger();
|
||||||
|
|
||||||
|
private final Map<BlockVector3, CompoundTag> tiles = new HashMap<>();
|
||||||
|
private final Set<CompoundTag> entities = new HashSet<>();
|
||||||
|
private final char[][] blocks;
|
||||||
|
private final int minHeight;
|
||||||
|
private final int maxHeight;
|
||||||
|
final ServerLevel serverLevel;
|
||||||
|
final LevelChunk levelChunk;
|
||||||
|
private PalettedContainer<Holder<Biome>>[] biomes = null;
|
||||||
|
|
||||||
|
protected PaperweightGetBlocks_Copy(LevelChunk levelChunk) {
|
||||||
|
this.levelChunk = levelChunk;
|
||||||
|
this.serverLevel = levelChunk.level;
|
||||||
|
this.minHeight = serverLevel.getMinBuildHeight();
|
||||||
|
this.maxHeight = serverLevel.getMaxBuildHeight() - 1; // Minecraft max limit is exclusive.
|
||||||
|
this.blocks = new char[getSectionCount()][];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void storeTile(BlockEntity blockEntity) {
|
||||||
|
tiles.put(
|
||||||
|
BlockVector3.at(
|
||||||
|
blockEntity.getBlockPos().getX(),
|
||||||
|
blockEntity.getBlockPos().getY(),
|
||||||
|
blockEntity.getBlockPos().getZ()
|
||||||
|
),
|
||||||
|
new PaperweightLazyCompoundTag(Suppliers.memoize(blockEntity::saveWithId))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<BlockVector3, CompoundTag> getTiles() {
|
||||||
|
return tiles;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Nullable
|
||||||
|
public CompoundTag getTile(int x, int y, int z) {
|
||||||
|
return tiles.get(BlockVector3.at(x, y, z));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings({"unchecked", "rawtypes"})
|
||||||
|
protected void storeEntity(Entity entity) {
|
||||||
|
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
|
||||||
|
net.minecraft.nbt.CompoundTag compoundTag = new net.minecraft.nbt.CompoundTag();
|
||||||
|
entity.save(compoundTag);
|
||||||
|
entities.add((CompoundTag) adapter.toNative(compoundTag));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<CompoundTag> getEntities() {
|
||||||
|
return this.entities;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundTag getEntity(UUID uuid) {
|
||||||
|
for (CompoundTag tag : entities) {
|
||||||
|
if (uuid.equals(tag.getUUID())) {
|
||||||
|
return tag;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isCreateCopy() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCreateCopy(boolean createCopy) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setLightingToGet(char[][] lighting, int minSectionPosition, int maxSectionPosition) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setSkyLightingToGet(char[][] lighting, int minSectionPosition, int maxSectionPosition) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHeightmapToGet(HeightMapType type, int[] data) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxY() {
|
||||||
|
return maxHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMinY() {
|
||||||
|
return minHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMaxSectionPosition() {
|
||||||
|
return maxHeight >> 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMinSectionPosition() {
|
||||||
|
return minHeight >> 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiomeType getBiomeType(int x, int y, int z) {
|
||||||
|
Holder<Biome> biome = biomes[(y >> 4) - getMinSectionPosition()].get(x >> 2, (y & 15) >> 2, z >> 2);
|
||||||
|
return PaperweightPlatformAdapter.adapt(biome, serverLevel);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removeSectionLighting(int layer, boolean sky) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean trim(boolean aggressive, int layer) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IBlocks reset() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSectionCount() {
|
||||||
|
return serverLevel.getSectionsCount();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void storeSection(int layer, char[] data) {
|
||||||
|
blocks[layer] = data;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void storeBiomes(int layer, PalettedContainerRO<Holder<Biome>> biomeData) {
|
||||||
|
if (biomes == null) {
|
||||||
|
biomes = new PalettedContainer[getSectionCount()];
|
||||||
|
}
|
||||||
|
if (biomeData instanceof PalettedContainer<Holder<Biome>> palettedContainer) {
|
||||||
|
biomes[layer] = palettedContainer.copy();
|
||||||
|
} else {
|
||||||
|
LOGGER.error(
|
||||||
|
"Cannot correctly save biomes to history. Expected class type {} but got {}",
|
||||||
|
PalettedContainer.class.getSimpleName(),
|
||||||
|
biomeData.getClass().getSimpleName()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBlock getFullBlock(int x, int y, int z) {
|
||||||
|
BlockState state = BlockTypesCache.states[get(x, y, z)];
|
||||||
|
return state.toBaseBlock(this, x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean hasSection(int layer) {
|
||||||
|
layer -= getMinSectionPosition();
|
||||||
|
return blocks[layer] != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public char[] load(int layer) {
|
||||||
|
layer -= getMinSectionPosition();
|
||||||
|
return blocks[layer];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public char[] loadIfPresent(int layer) {
|
||||||
|
layer -= getMinSectionPosition();
|
||||||
|
return blocks[layer];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BlockState getBlock(int x, int y, int z) {
|
||||||
|
return BlockTypesCache.states[get(x, y, z)];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getSkyLight(int x, int y, int z) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getEmittedLight(int x, int y, int z) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int[] getHeightMap(HeightMapType type) {
|
||||||
|
return new int[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <T extends Future<T>> T call(IChunkSet set, Runnable finalize) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public char get(int x, int y, int z) {
|
||||||
|
final int layer = (y >> 4) - getMinSectionPosition();
|
||||||
|
final int index = (y & 15) << 8 | z << 4 | x;
|
||||||
|
return blocks[layer][index];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean trim(boolean aggressive) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,34 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.MapChunkUtil;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.Refraction;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
|
||||||
|
|
||||||
|
//TODO un-very-break-this
|
||||||
|
public class PaperweightMapChunkUtil extends MapChunkUtil<ClientboundLevelChunkWithLightPacket> {
|
||||||
|
|
||||||
|
public PaperweightMapChunkUtil() throws NoSuchFieldException {
|
||||||
|
fieldX = ClientboundLevelChunkPacketData.class.getDeclaredField(Refraction.pickName("TWO_MEGABYTES", "a"));
|
||||||
|
fieldZ = ClientboundLevelChunkWithLightPacket.class.getDeclaredField(Refraction.pickName("x", "a"));
|
||||||
|
fieldBitMask = ClientboundLevelChunkWithLightPacket.class.getDeclaredField(Refraction.pickName("z", "b"));
|
||||||
|
fieldHeightMap = ClientboundLevelChunkPacketData.class.getDeclaredField(Refraction.pickName("heightmaps", "b"));
|
||||||
|
fieldChunkData = ClientboundLevelChunkWithLightPacket.class.getDeclaredField(Refraction.pickName("chunkData", "c"));
|
||||||
|
fieldBlockEntities = ClientboundLevelChunkPacketData.class.getDeclaredField(Refraction.pickName("buffer", "c"));
|
||||||
|
fieldFull = ClientboundLevelChunkPacketData.class.getDeclaredField(Refraction.pickName("blockEntitiesData", "d"));
|
||||||
|
fieldX.setAccessible(true);
|
||||||
|
fieldZ.setAccessible(true);
|
||||||
|
fieldBitMask.setAccessible(true);
|
||||||
|
fieldHeightMap.setAccessible(true);
|
||||||
|
fieldChunkData.setAccessible(true);
|
||||||
|
fieldBlockEntities.setAccessible(true);
|
||||||
|
fieldFull.setAccessible(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ClientboundLevelChunkWithLightPacket createPacket() {
|
||||||
|
// TODO ??? return new ClientboundLevelChunkPacket();
|
||||||
|
throw new UnsupportedOperationException();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,720 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.destroystokyo.paper.util.maplist.EntityList;
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.CachedBukkitAdapter;
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.DelegateSemaphore;
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.NMSAdapter;
|
||||||
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
|
import com.fastasyncworldedit.core.FaweCache;
|
||||||
|
import com.fastasyncworldedit.core.math.BitArrayUnstretched;
|
||||||
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
|
import com.fastasyncworldedit.core.util.ReflectionUtils;
|
||||||
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
|
import com.mojang.datafixers.util.Either;
|
||||||
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.Refraction;
|
||||||
|
import com.sk89q.worldedit.world.biome.BiomeType;
|
||||||
|
import com.sk89q.worldedit.world.biome.BiomeTypes;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
|
import io.papermc.lib.PaperLib;
|
||||||
|
import io.papermc.paper.world.ChunkEntitySlices;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.IdMap;
|
||||||
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
|
||||||
|
import net.minecraft.server.level.ChunkHolder;
|
||||||
|
import net.minecraft.server.level.ChunkMap;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
|
import net.minecraft.server.level.TicketType;
|
||||||
|
import net.minecraft.util.BitStorage;
|
||||||
|
import net.minecraft.util.ExceptionCollector;
|
||||||
|
import net.minecraft.util.SimpleBitStorage;
|
||||||
|
import net.minecraft.util.ThreadingDetector;
|
||||||
|
import net.minecraft.util.Unit;
|
||||||
|
import net.minecraft.util.ZeroBitStorage;
|
||||||
|
import net.minecraft.world.entity.Entity;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.LevelAccessor;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkStatus;
|
||||||
|
import net.minecraft.world.level.chunk.GlobalPalette;
|
||||||
|
import net.minecraft.world.level.chunk.HashMapPalette;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunkSection;
|
||||||
|
import net.minecraft.world.level.chunk.LinearPalette;
|
||||||
|
import net.minecraft.world.level.chunk.Palette;
|
||||||
|
import net.minecraft.world.level.chunk.PalettedContainer;
|
||||||
|
import net.minecraft.world.level.chunk.SingleValuePalette;
|
||||||
|
import net.minecraft.world.level.entity.PersistentEntitySectionManager;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftChunk;
|
||||||
|
import sun.misc.Unsafe;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.lang.invoke.MethodHandle;
|
||||||
|
import java.lang.invoke.MethodHandles;
|
||||||
|
import java.lang.invoke.MethodType;
|
||||||
|
import java.lang.reflect.Constructor;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.Semaphore;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
|
import static java.lang.invoke.MethodType.methodType;
|
||||||
|
import static net.minecraft.core.registries.Registries.BIOME;
|
||||||
|
|
||||||
|
public final class PaperweightPlatformAdapter extends NMSAdapter {
|
||||||
|
|
||||||
|
public static final Field fieldData;
|
||||||
|
|
||||||
|
public static final Constructor<?> dataConstructor;
|
||||||
|
|
||||||
|
public static final Field fieldStorage;
|
||||||
|
public static final Field fieldPalette;
|
||||||
|
|
||||||
|
private static final Field fieldTickingFluidCount;
|
||||||
|
private static final Field fieldTickingBlockCount;
|
||||||
|
private static final Field fieldNonEmptyBlockCount;
|
||||||
|
|
||||||
|
private static final MethodHandle methodGetVisibleChunk;
|
||||||
|
|
||||||
|
private static final int CHUNKSECTION_BASE;
|
||||||
|
private static final int CHUNKSECTION_SHIFT;
|
||||||
|
|
||||||
|
private static final Field fieldThreadingDetector;
|
||||||
|
private static final long fieldThreadingDetectorOffset;
|
||||||
|
|
||||||
|
private static final Field fieldLock;
|
||||||
|
private static final long fieldLockOffset;
|
||||||
|
|
||||||
|
private static final MethodHandle methodRemoveGameEventListener;
|
||||||
|
private static final MethodHandle methodremoveTickingBlockEntity;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This is a workaround for the changes from https://hub.spigotmc.org/stash/projects/SPIGOT/repos/craftbukkit/commits/1fddefce1cdce44010927b888432bf70c0e88cde#src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||||
|
* and is only needed to support 1.19.4 versions before *and* after this change.
|
||||||
|
*/
|
||||||
|
private static final MethodHandle CRAFT_CHUNK_GET_HANDLE;
|
||||||
|
|
||||||
|
private static final Field fieldRemove;
|
||||||
|
|
||||||
|
static final boolean POST_CHUNK_REWRITE;
|
||||||
|
private static Method PAPER_CHUNK_GEN_ALL_ENTITIES;
|
||||||
|
private static Field LEVEL_CHUNK_ENTITIES;
|
||||||
|
private static Field SERVER_LEVEL_ENTITY_MANAGER;
|
||||||
|
|
||||||
|
static {
|
||||||
|
final MethodHandles.Lookup lookup = MethodHandles.lookup();
|
||||||
|
try {
|
||||||
|
fieldData = PalettedContainer.class.getDeclaredField(Refraction.pickName("data", "d"));
|
||||||
|
fieldData.setAccessible(true);
|
||||||
|
|
||||||
|
Class<?> dataClazz = fieldData.getType();
|
||||||
|
dataConstructor = dataClazz.getDeclaredConstructors()[0];
|
||||||
|
dataConstructor.setAccessible(true);
|
||||||
|
|
||||||
|
fieldStorage = dataClazz.getDeclaredField(Refraction.pickName("storage", "b"));
|
||||||
|
fieldStorage.setAccessible(true);
|
||||||
|
fieldPalette = dataClazz.getDeclaredField(Refraction.pickName("palette", "c"));
|
||||||
|
fieldPalette.setAccessible(true);
|
||||||
|
|
||||||
|
fieldTickingFluidCount = LevelChunkSection.class.getDeclaredField(Refraction.pickName("tickingFluidCount", "g"));
|
||||||
|
fieldTickingFluidCount.setAccessible(true);
|
||||||
|
fieldTickingBlockCount = LevelChunkSection.class.getDeclaredField(Refraction.pickName("tickingBlockCount", "f"));
|
||||||
|
fieldTickingBlockCount.setAccessible(true);
|
||||||
|
fieldNonEmptyBlockCount = LevelChunkSection.class.getDeclaredField(Refraction.pickName("nonEmptyBlockCount", "e"));
|
||||||
|
fieldNonEmptyBlockCount.setAccessible(true);
|
||||||
|
|
||||||
|
Method getVisibleChunkIfPresent = ChunkMap.class.getDeclaredMethod(Refraction.pickName(
|
||||||
|
"getVisibleChunkIfPresent",
|
||||||
|
"b"
|
||||||
|
), long.class);
|
||||||
|
getVisibleChunkIfPresent.setAccessible(true);
|
||||||
|
methodGetVisibleChunk = lookup.unreflect(getVisibleChunkIfPresent);
|
||||||
|
|
||||||
|
Unsafe unsafe = ReflectionUtils.getUnsafe();
|
||||||
|
if (!PaperLib.isPaper()) {
|
||||||
|
fieldThreadingDetector = PalettedContainer.class.getDeclaredField(Refraction.pickName("threadingDetector", "f"));
|
||||||
|
fieldThreadingDetectorOffset = unsafe.objectFieldOffset(fieldThreadingDetector);
|
||||||
|
|
||||||
|
fieldLock = ThreadingDetector.class.getDeclaredField(Refraction.pickName("lock", "c"));
|
||||||
|
fieldLockOffset = unsafe.objectFieldOffset(fieldLock);
|
||||||
|
} else {
|
||||||
|
// in paper, the used methods are synchronized properly
|
||||||
|
fieldThreadingDetector = null;
|
||||||
|
fieldThreadingDetectorOffset = -1;
|
||||||
|
|
||||||
|
fieldLock = null;
|
||||||
|
fieldLockOffset = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
Method removeGameEventListener = LevelChunk.class.getDeclaredMethod(
|
||||||
|
Refraction.pickName("removeGameEventListener", "a"),
|
||||||
|
BlockEntity.class,
|
||||||
|
ServerLevel.class
|
||||||
|
);
|
||||||
|
removeGameEventListener.setAccessible(true);
|
||||||
|
methodRemoveGameEventListener = lookup.unreflect(removeGameEventListener);
|
||||||
|
|
||||||
|
Method removeBlockEntityTicker = LevelChunk.class.getDeclaredMethod(
|
||||||
|
Refraction.pickName(
|
||||||
|
"removeBlockEntityTicker",
|
||||||
|
"l"
|
||||||
|
), BlockPos.class
|
||||||
|
);
|
||||||
|
removeBlockEntityTicker.setAccessible(true);
|
||||||
|
methodremoveTickingBlockEntity = lookup.unreflect(removeBlockEntityTicker);
|
||||||
|
|
||||||
|
fieldRemove = BlockEntity.class.getDeclaredField(Refraction.pickName("remove", "q"));
|
||||||
|
fieldRemove.setAccessible(true);
|
||||||
|
|
||||||
|
CHUNKSECTION_BASE = unsafe.arrayBaseOffset(LevelChunkSection[].class);
|
||||||
|
int scale = unsafe.arrayIndexScale(LevelChunkSection[].class);
|
||||||
|
if ((scale & (scale - 1)) != 0) {
|
||||||
|
throw new Error("data type scale not a power of two");
|
||||||
|
}
|
||||||
|
CHUNKSECTION_SHIFT = 31 - Integer.numberOfLeadingZeros(scale);
|
||||||
|
boolean chunkRewrite;
|
||||||
|
try {
|
||||||
|
ServerLevel.class.getDeclaredMethod("getEntityLookup");
|
||||||
|
chunkRewrite = true;
|
||||||
|
PAPER_CHUNK_GEN_ALL_ENTITIES = ChunkEntitySlices.class.getDeclaredMethod("getAllEntities");
|
||||||
|
PAPER_CHUNK_GEN_ALL_ENTITIES.setAccessible(true);
|
||||||
|
} catch (NoSuchMethodException ignored) {
|
||||||
|
chunkRewrite = false;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Paper - Pre-Chunk-Update
|
||||||
|
LEVEL_CHUNK_ENTITIES = LevelChunk.class.getDeclaredField("entities");
|
||||||
|
LEVEL_CHUNK_ENTITIES.setAccessible(true);
|
||||||
|
} catch (NoSuchFieldException ignored) {
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// Non-Paper
|
||||||
|
SERVER_LEVEL_ENTITY_MANAGER = ServerLevel.class.getDeclaredField(Refraction.pickName("entityManager", "M"));
|
||||||
|
LEVEL_CHUNK_ENTITIES.setAccessible(true);
|
||||||
|
} catch (NoSuchFieldException ignored) {
|
||||||
|
}
|
||||||
|
POST_CHUNK_REWRITE = chunkRewrite;
|
||||||
|
} catch (RuntimeException | Error e) {
|
||||||
|
throw e;
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
MethodHandle craftChunkGetHandle;
|
||||||
|
final MethodType type = methodType(LevelChunk.class);
|
||||||
|
try {
|
||||||
|
craftChunkGetHandle = lookup.findVirtual(CraftChunk.class, "getHandle", type);
|
||||||
|
} catch (NoSuchMethodException | IllegalAccessException e) {
|
||||||
|
try {
|
||||||
|
final MethodType newType = methodType(ChunkAccess.class, ChunkStatus.class);
|
||||||
|
craftChunkGetHandle = lookup.findVirtual(CraftChunk.class, "getHandle", newType);
|
||||||
|
craftChunkGetHandle = MethodHandles.insertArguments(craftChunkGetHandle, 1, ChunkStatus.FULL);
|
||||||
|
} catch (NoSuchMethodException | IllegalAccessException ex) {
|
||||||
|
throw new RuntimeException(ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CRAFT_CHUNK_GET_HANDLE = craftChunkGetHandle;
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean setSectionAtomic(
|
||||||
|
LevelChunkSection[] sections,
|
||||||
|
LevelChunkSection expected,
|
||||||
|
LevelChunkSection value,
|
||||||
|
int layer
|
||||||
|
) {
|
||||||
|
long offset = ((long) layer << CHUNKSECTION_SHIFT) + CHUNKSECTION_BASE;
|
||||||
|
if (layer >= 0 && layer < sections.length) {
|
||||||
|
return ReflectionUtils.getUnsafe().compareAndSwapObject(sections, offset, expected, value);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// There is no point in having a functional semaphore for paper servers.
|
||||||
|
private static final ThreadLocal<DelegateSemaphore> SEMAPHORE_THREAD_LOCAL =
|
||||||
|
ThreadLocal.withInitial(() -> new DelegateSemaphore(1, null));
|
||||||
|
|
||||||
|
static DelegateSemaphore applyLock(LevelChunkSection section) {
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
return SEMAPHORE_THREAD_LOCAL.get();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
synchronized (section) {
|
||||||
|
Unsafe unsafe = ReflectionUtils.getUnsafe();
|
||||||
|
PalettedContainer<net.minecraft.world.level.block.state.BlockState> blocks = section.getStates();
|
||||||
|
ThreadingDetector currentThreadingDetector = (ThreadingDetector) unsafe.getObject(
|
||||||
|
blocks,
|
||||||
|
fieldThreadingDetectorOffset
|
||||||
|
);
|
||||||
|
synchronized (currentThreadingDetector) {
|
||||||
|
Semaphore currentLock = (Semaphore) unsafe.getObject(currentThreadingDetector, fieldLockOffset);
|
||||||
|
if (currentLock instanceof DelegateSemaphore delegateSemaphore) {
|
||||||
|
return delegateSemaphore;
|
||||||
|
}
|
||||||
|
DelegateSemaphore newLock = new DelegateSemaphore(1, currentLock);
|
||||||
|
unsafe.putObject(currentThreadingDetector, fieldLockOffset, newLock);
|
||||||
|
return newLock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LevelChunk ensureLoaded(ServerLevel serverLevel, int chunkX, int chunkZ) {
|
||||||
|
if (!PaperLib.isPaper()) {
|
||||||
|
LevelChunk nmsChunk = serverLevel.getChunkSource().getChunk(chunkX, chunkZ, false);
|
||||||
|
if (nmsChunk != null) {
|
||||||
|
return nmsChunk;
|
||||||
|
}
|
||||||
|
if (Fawe.isMainThread()) {
|
||||||
|
return serverLevel.getChunk(chunkX, chunkZ);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
LevelChunk nmsChunk = serverLevel.getChunkSource().getChunkAtIfCachedImmediately(chunkX, chunkZ);
|
||||||
|
if (nmsChunk != null) {
|
||||||
|
addTicket(serverLevel, chunkX, chunkZ);
|
||||||
|
return nmsChunk;
|
||||||
|
}
|
||||||
|
nmsChunk = serverLevel.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ);
|
||||||
|
if (nmsChunk != null) {
|
||||||
|
addTicket(serverLevel, chunkX, chunkZ);
|
||||||
|
return nmsChunk;
|
||||||
|
}
|
||||||
|
// Avoid "async" methods from the main thread.
|
||||||
|
if (Fawe.isMainThread()) {
|
||||||
|
return serverLevel.getChunk(chunkX, chunkZ);
|
||||||
|
}
|
||||||
|
CompletableFuture<org.bukkit.Chunk> future = serverLevel.getWorld().getChunkAtAsync(chunkX, chunkZ, true, true);
|
||||||
|
try {
|
||||||
|
CraftChunk chunk = (CraftChunk) future.get();
|
||||||
|
addTicket(serverLevel, chunkX, chunkZ);
|
||||||
|
return (LevelChunk) CRAFT_CHUNK_GET_HANDLE.invoke(chunk);
|
||||||
|
} catch (Throwable e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return TaskManager.taskManager().sync(() -> serverLevel.getChunk(chunkX, chunkZ));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addTicket(ServerLevel serverLevel, int chunkX, int chunkZ) {
|
||||||
|
// Ensure chunk is definitely loaded before applying a ticket
|
||||||
|
io.papermc.paper.util.MCUtil.MAIN_EXECUTOR.execute(() -> serverLevel
|
||||||
|
.getChunkSource()
|
||||||
|
.addRegionTicket(TicketType.UNLOAD_COOLDOWN, new ChunkPos(chunkX, chunkZ), 0, Unit.INSTANCE));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ChunkHolder getPlayerChunk(ServerLevel nmsWorld, final int chunkX, final int chunkZ) {
|
||||||
|
ChunkMap chunkMap = nmsWorld.getChunkSource().chunkMap;
|
||||||
|
try {
|
||||||
|
return (ChunkHolder) methodGetVisibleChunk.invoke(chunkMap, ChunkPos.asLong(chunkX, chunkZ));
|
||||||
|
} catch (Throwable thr) {
|
||||||
|
throw new RuntimeException(thr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static void sendChunk(ServerLevel nmsWorld, int chunkX, int chunkZ, boolean lighting) {
|
||||||
|
ChunkHolder chunkHolder = getPlayerChunk(nmsWorld, chunkX, chunkZ);
|
||||||
|
if (chunkHolder == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ChunkPos coordIntPair = new ChunkPos(chunkX, chunkZ);
|
||||||
|
LevelChunk levelChunk;
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
// getChunkAtIfLoadedImmediately is paper only
|
||||||
|
levelChunk = nmsWorld
|
||||||
|
.getChunkSource()
|
||||||
|
.getChunkAtIfLoadedImmediately(chunkX, chunkZ);
|
||||||
|
} else {
|
||||||
|
levelChunk = ((Optional<LevelChunk>) ((Either) chunkHolder
|
||||||
|
.getTickingChunkFuture() // method is not present with new paper chunk system
|
||||||
|
.getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left())
|
||||||
|
.orElse(null);
|
||||||
|
}
|
||||||
|
if (levelChunk == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
TaskManager.taskManager().task(() -> {
|
||||||
|
ClientboundLevelChunkWithLightPacket packet;
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
packet = new ClientboundLevelChunkWithLightPacket(
|
||||||
|
levelChunk,
|
||||||
|
nmsWorld.getChunkSource().getLightEngine(),
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
// last false is to not bother with x-ray
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// deprecated on paper - deprecation suppressed
|
||||||
|
packet = new ClientboundLevelChunkWithLightPacket(
|
||||||
|
levelChunk,
|
||||||
|
nmsWorld.getChunkSource().getLightEngine(),
|
||||||
|
null,
|
||||||
|
null
|
||||||
|
);
|
||||||
|
}
|
||||||
|
nearbyPlayers(nmsWorld, coordIntPair).forEach(p -> p.connection.send(packet));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ServerPlayer> nearbyPlayers(ServerLevel serverLevel, ChunkPos coordIntPair) {
|
||||||
|
return serverLevel.getChunkSource().chunkMap.getPlayers(coordIntPair, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
NMS conversion
|
||||||
|
*/
|
||||||
|
public static LevelChunkSection newChunkSection(
|
||||||
|
final int layer,
|
||||||
|
final char[] blocks,
|
||||||
|
CachedBukkitAdapter adapter,
|
||||||
|
Registry<Biome> biomeRegistry,
|
||||||
|
@Nullable PalettedContainer<Holder<Biome>> biomes
|
||||||
|
) {
|
||||||
|
return newChunkSection(layer, null, blocks, adapter, biomeRegistry, biomes);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LevelChunkSection newChunkSection(
|
||||||
|
final int layer,
|
||||||
|
final Function<Integer, char[]> get,
|
||||||
|
char[] set,
|
||||||
|
CachedBukkitAdapter adapter,
|
||||||
|
Registry<Biome> biomeRegistry,
|
||||||
|
@Nullable PalettedContainer<Holder<Biome>> biomes
|
||||||
|
) {
|
||||||
|
if (set == null) {
|
||||||
|
return newChunkSection(layer, biomeRegistry, biomes);
|
||||||
|
}
|
||||||
|
final int[] blockToPalette = FaweCache.INSTANCE.BLOCK_TO_PALETTE.get();
|
||||||
|
final int[] paletteToBlock = FaweCache.INSTANCE.PALETTE_TO_BLOCK.get();
|
||||||
|
final long[] blockStates = FaweCache.INSTANCE.BLOCK_STATES.get();
|
||||||
|
final int[] blocksCopy = FaweCache.INSTANCE.SECTION_BLOCKS.get();
|
||||||
|
try {
|
||||||
|
int num_palette;
|
||||||
|
if (get == null) {
|
||||||
|
num_palette = createPalette(blockToPalette, paletteToBlock, blocksCopy, set, adapter, null);
|
||||||
|
} else {
|
||||||
|
num_palette = createPalette(layer, blockToPalette, paletteToBlock, blocksCopy, get, set, adapter, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
int bitsPerEntry = MathMan.log2nlz(num_palette - 1);
|
||||||
|
if (bitsPerEntry > 0 && bitsPerEntry < 5) {
|
||||||
|
bitsPerEntry = 4;
|
||||||
|
} else if (bitsPerEntry > 8) {
|
||||||
|
bitsPerEntry = MathMan.log2nlz(Block.BLOCK_STATE_REGISTRY.size() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
|
||||||
|
final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
|
||||||
|
final int blockBitArrayEnd = MathMan.ceilZero((float) 4096 / blocksPerLong);
|
||||||
|
|
||||||
|
if (num_palette == 1) {
|
||||||
|
for (int i = 0; i < blockBitArrayEnd; i++) {
|
||||||
|
blockStates[i] = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
final BitArrayUnstretched bitArray = new BitArrayUnstretched(bitsPerEntryNonZero, 4096, blockStates);
|
||||||
|
bitArray.fromRaw(blocksCopy);
|
||||||
|
}
|
||||||
|
|
||||||
|
final long[] bits = Arrays.copyOfRange(blockStates, 0, blockBitArrayEnd);
|
||||||
|
final BitStorage nmsBits;
|
||||||
|
if (bitsPerEntry == 0) {
|
||||||
|
nmsBits = new ZeroBitStorage(4096);
|
||||||
|
} else {
|
||||||
|
nmsBits = new SimpleBitStorage(bitsPerEntry, 4096, bits);
|
||||||
|
}
|
||||||
|
List<net.minecraft.world.level.block.state.BlockState> palette;
|
||||||
|
if (bitsPerEntry < 9) {
|
||||||
|
palette = new ArrayList<>();
|
||||||
|
for (int i = 0; i < num_palette; i++) {
|
||||||
|
int ordinal = paletteToBlock[i];
|
||||||
|
blockToPalette[ordinal] = Integer.MAX_VALUE;
|
||||||
|
final BlockState state = BlockTypesCache.states[ordinal];
|
||||||
|
palette.add(((PaperweightBlockMaterial) state.getMaterial()).getState());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
palette = List.of();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create palette with data
|
||||||
|
@SuppressWarnings("deprecation") // constructor is deprecated on paper, but needed to keep compatibility with spigot
|
||||||
|
final PalettedContainer<net.minecraft.world.level.block.state.BlockState> blockStatePalettedContainer =
|
||||||
|
new PalettedContainer<>(
|
||||||
|
Block.BLOCK_STATE_REGISTRY,
|
||||||
|
PalettedContainer.Strategy.SECTION_STATES,
|
||||||
|
PalettedContainer.Strategy.SECTION_STATES.getConfiguration(Block.BLOCK_STATE_REGISTRY, bitsPerEntry),
|
||||||
|
nmsBits,
|
||||||
|
palette
|
||||||
|
);
|
||||||
|
if (biomes == null) {
|
||||||
|
IdMap<Holder<Biome>> biomeHolderIdMap = biomeRegistry.asHolderIdMap();
|
||||||
|
biomes = new PalettedContainer<>(
|
||||||
|
biomeHolderIdMap,
|
||||||
|
biomeHolderIdMap.byIdOrThrow(WorldEditPlugin
|
||||||
|
.getInstance()
|
||||||
|
.getBukkitImplAdapter()
|
||||||
|
.getInternalBiomeId(
|
||||||
|
BiomeTypes.PLAINS)),
|
||||||
|
PalettedContainer.Strategy.SECTION_BIOMES
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LevelChunkSection(blockStatePalettedContainer, biomes);
|
||||||
|
} catch (final Throwable e) {
|
||||||
|
throw e;
|
||||||
|
} finally {
|
||||||
|
Arrays.fill(blockToPalette, Integer.MAX_VALUE);
|
||||||
|
Arrays.fill(paletteToBlock, Integer.MAX_VALUE);
|
||||||
|
Arrays.fill(blockStates, 0);
|
||||||
|
Arrays.fill(blocksCopy, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation") // Only deprecated in paper
|
||||||
|
private static LevelChunkSection newChunkSection(
|
||||||
|
int layer,
|
||||||
|
Registry<Biome> biomeRegistry,
|
||||||
|
@Nullable PalettedContainer<Holder<Biome>> biomes
|
||||||
|
) {
|
||||||
|
if (biomes == null) {
|
||||||
|
return new LevelChunkSection(biomeRegistry);
|
||||||
|
}
|
||||||
|
PalettedContainer<net.minecraft.world.level.block.state.BlockState> dataPaletteBlocks = new PalettedContainer<>(
|
||||||
|
Block.BLOCK_STATE_REGISTRY,
|
||||||
|
Blocks.AIR.defaultBlockState(),
|
||||||
|
PalettedContainer.Strategy.SECTION_STATES
|
||||||
|
);
|
||||||
|
return new LevelChunkSection(dataPaletteBlocks, biomes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new {@link PalettedContainer<Biome>}. Should only be used if no biome container existed beforehand.
|
||||||
|
*/
|
||||||
|
public static PalettedContainer<Holder<Biome>> getBiomePalettedContainer(
|
||||||
|
BiomeType[] biomes,
|
||||||
|
IdMap<Holder<Biome>> biomeRegistry
|
||||||
|
) {
|
||||||
|
if (biomes == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
BukkitImplAdapter<?> adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
|
||||||
|
// Don't stream this as typically will see 1-4 biomes; stream overhead is large for the small length
|
||||||
|
Map<BiomeType, Holder<Biome>> palette = new HashMap<>();
|
||||||
|
for (BiomeType biomeType : new LinkedList<>(Arrays.asList(biomes))) {
|
||||||
|
Holder<Biome> biome;
|
||||||
|
if (biomeType == null) {
|
||||||
|
biome = biomeRegistry.byId(adapter.getInternalBiomeId(BiomeTypes.PLAINS));
|
||||||
|
} else {
|
||||||
|
biome = biomeRegistry.byId(adapter.getInternalBiomeId(biomeType));
|
||||||
|
}
|
||||||
|
palette.put(biomeType, biome);
|
||||||
|
}
|
||||||
|
int biomeCount = palette.size();
|
||||||
|
int bitsPerEntry = MathMan.log2nlz(biomeCount - 1);
|
||||||
|
Object configuration = PalettedContainer.Strategy.SECTION_STATES.getConfiguration(
|
||||||
|
new FakeIdMapBiome(biomeCount),
|
||||||
|
bitsPerEntry
|
||||||
|
);
|
||||||
|
if (bitsPerEntry > 3) {
|
||||||
|
bitsPerEntry = MathMan.log2nlz(biomeRegistry.size() - 1);
|
||||||
|
}
|
||||||
|
PalettedContainer<Holder<Biome>> biomePalettedContainer = new PalettedContainer<>(
|
||||||
|
biomeRegistry,
|
||||||
|
biomeRegistry.byIdOrThrow(adapter.getInternalBiomeId(BiomeTypes.PLAINS)),
|
||||||
|
PalettedContainer.Strategy.SECTION_BIOMES
|
||||||
|
);
|
||||||
|
|
||||||
|
final Palette<Holder<Biome>> biomePalette;
|
||||||
|
if (bitsPerEntry == 0) {
|
||||||
|
biomePalette = new SingleValuePalette<>(
|
||||||
|
biomePalettedContainer.registry,
|
||||||
|
biomePalettedContainer,
|
||||||
|
new ArrayList<>(palette.values()) // Must be modifiable
|
||||||
|
);
|
||||||
|
} else if (bitsPerEntry == 4) {
|
||||||
|
biomePalette = LinearPalette.create(
|
||||||
|
4,
|
||||||
|
biomePalettedContainer.registry,
|
||||||
|
biomePalettedContainer,
|
||||||
|
new ArrayList<>(palette.values()) // Must be modifiable
|
||||||
|
);
|
||||||
|
} else if (bitsPerEntry < 9) {
|
||||||
|
biomePalette = HashMapPalette.create(
|
||||||
|
bitsPerEntry,
|
||||||
|
biomePalettedContainer.registry,
|
||||||
|
biomePalettedContainer,
|
||||||
|
new ArrayList<>(palette.values()) // Must be modifiable
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
biomePalette = GlobalPalette.create(
|
||||||
|
bitsPerEntry,
|
||||||
|
biomePalettedContainer.registry,
|
||||||
|
biomePalettedContainer,
|
||||||
|
null // unused
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
int bitsPerEntryNonZero = Math.max(bitsPerEntry, 1); // We do want to use zero sometimes
|
||||||
|
final int blocksPerLong = MathMan.floorZero((double) 64 / bitsPerEntryNonZero);
|
||||||
|
final int arrayLength = MathMan.ceilZero(64f / blocksPerLong);
|
||||||
|
|
||||||
|
|
||||||
|
BitStorage bitStorage = bitsPerEntry == 0 ? new ZeroBitStorage(64) : new SimpleBitStorage(
|
||||||
|
bitsPerEntry,
|
||||||
|
64,
|
||||||
|
new long[arrayLength]
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
Object data = dataConstructor.newInstance(configuration, bitStorage, biomePalette);
|
||||||
|
fieldData.set(biomePalettedContainer, data);
|
||||||
|
int index = 0;
|
||||||
|
for (int y = 0; y < 4; y++) {
|
||||||
|
for (int z = 0; z < 4; z++) {
|
||||||
|
for (int x = 0; x < 4; x++, index++) {
|
||||||
|
BiomeType biomeType = biomes[index];
|
||||||
|
if (biomeType == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Holder<Biome> biome = biomeRegistry.byId(WorldEditPlugin
|
||||||
|
.getInstance()
|
||||||
|
.getBukkitImplAdapter()
|
||||||
|
.getInternalBiomeId(biomeType));
|
||||||
|
if (biome == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
biomePalettedContainer.set(x, y, z, biome);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
return biomePalettedContainer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void clearCounts(final LevelChunkSection section) throws IllegalAccessException {
|
||||||
|
fieldTickingFluidCount.setShort(section, (short) 0);
|
||||||
|
fieldTickingBlockCount.setShort(section, (short) 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static BiomeType adapt(Holder<Biome> biome, LevelAccessor levelAccessor) {
|
||||||
|
final Registry<Biome> biomeRegistry = levelAccessor.registryAccess().registryOrThrow(BIOME);
|
||||||
|
if (biomeRegistry.getKey(biome.value()) == null) {
|
||||||
|
return biomeRegistry.asHolderIdMap().getId(biome) == -1 ? BiomeTypes.OCEAN
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
return BiomeTypes.get(biome.unwrapKey().orElseThrow().location().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
static void removeBeacon(BlockEntity beacon, LevelChunk levelChunk) {
|
||||||
|
try {
|
||||||
|
if (levelChunk.loaded || levelChunk.level.isClientSide()) {
|
||||||
|
BlockEntity blockEntity = levelChunk.blockEntities.remove(beacon.getBlockPos());
|
||||||
|
if (blockEntity != null) {
|
||||||
|
if (!levelChunk.level.isClientSide) {
|
||||||
|
methodRemoveGameEventListener.invoke(levelChunk, beacon, levelChunk.level);
|
||||||
|
}
|
||||||
|
fieldRemove.set(beacon, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodremoveTickingBlockEntity.invoke(levelChunk, beacon.getBlockPos());
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
throwable.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<Entity> getEntities(LevelChunk chunk) {
|
||||||
|
ExceptionCollector<RuntimeException> collector = new ExceptionCollector<>();
|
||||||
|
if (PaperLib.isPaper()) {
|
||||||
|
if (POST_CHUNK_REWRITE) {
|
||||||
|
try {
|
||||||
|
//noinspection unchecked
|
||||||
|
return (List<Entity>) PAPER_CHUNK_GEN_ALL_ENTITIES.invoke(chunk.level.getEntityLookup().getChunk(chunk.locX, chunk.locZ));
|
||||||
|
} catch (IllegalAccessException | InvocationTargetException e) {
|
||||||
|
throw new RuntimeException("Failed to lookup entities [POST_CHUNK_REWRITE=true]", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
EntityList entityList = (EntityList) LEVEL_CHUNK_ENTITIES.get(chunk);
|
||||||
|
return List.of(entityList.getRawData());
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
collector.add(new RuntimeException("Failed to lookup entities [POST_CHUNK_REWRITE=false]", e));
|
||||||
|
// fall through
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
//noinspection unchecked
|
||||||
|
return ((PersistentEntitySectionManager<Entity>) (SERVER_LEVEL_ENTITY_MANAGER.get(chunk.level))).getEntities(chunk.getPos());
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
collector.add(new RuntimeException("Failed to lookup entities [PAPER=false]", e));
|
||||||
|
}
|
||||||
|
collector.throwIfPresent();
|
||||||
|
return List.of();
|
||||||
|
}
|
||||||
|
|
||||||
|
record FakeIdMapBlock(int size) implements IdMap<net.minecraft.world.level.block.state.BlockState> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getId(final net.minecraft.world.level.block.state.BlockState entry) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public net.minecraft.world.level.block.state.BlockState byId(final int index) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
@Override
|
||||||
|
public Iterator<net.minecraft.world.level.block.state.BlockState> iterator() {
|
||||||
|
return Collections.emptyIterator();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
record FakeIdMapBiome(int size) implements IdMap<Biome> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getId(final Biome entry) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public Biome byId(final int index) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
@Override
|
||||||
|
public Iterator<Biome> iterator() {
|
||||||
|
return Collections.emptyIterator();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,175 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.ProcessorScope;
|
||||||
|
import com.fastasyncworldedit.core.queue.IBatchProcessor;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunk;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkSet;
|
||||||
|
import com.fastasyncworldedit.core.registry.state.PropertyKey;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
|
import com.sk89q.worldedit.world.block.BlockTypesCache;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.world.level.material.Fluid;
|
||||||
|
import net.minecraft.world.level.material.Fluids;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
public class PaperweightPostProcessor implements IBatchProcessor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IChunkSet processSet(final IChunk chunk, final IChunkGet get, final IChunkSet set) {
|
||||||
|
return set;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
@Override
|
||||||
|
public void postProcess(final IChunk chunk, final IChunkGet iChunkGet, final IChunkSet iChunkSet) {
|
||||||
|
boolean tickFluid = Settings.settings().EXPERIMENTAL.ALLOW_TICK_FLUIDS;
|
||||||
|
// The PostProcessor shouldn't be added, but just in case
|
||||||
|
if (!tickFluid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
PaperweightGetBlocks_Copy getBlocks = (PaperweightGetBlocks_Copy) iChunkGet;
|
||||||
|
layer:
|
||||||
|
for (int layer = iChunkSet.getMinSectionPosition(); layer <= iChunkSet.getMaxSectionPosition(); layer++) {
|
||||||
|
char[] set = iChunkSet.loadIfPresent(layer);
|
||||||
|
if (set == null) {
|
||||||
|
// No edit means no need to process
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
char[] get = null;
|
||||||
|
for (int i = 0; i < 4096; i++) {
|
||||||
|
char ordinal = set[i];
|
||||||
|
char replacedOrdinal = BlockTypesCache.ReservedIDs.__RESERVED__;
|
||||||
|
boolean fromGet = false; // Used for liquids
|
||||||
|
if (ordinal == BlockTypesCache.ReservedIDs.__RESERVED__) {
|
||||||
|
if (get == null) {
|
||||||
|
get = getBlocks.load(layer);
|
||||||
|
}
|
||||||
|
// If this is null, then it's because we're loading a layer in the range of 0->15, but blocks aren't
|
||||||
|
// actually being set
|
||||||
|
if (get == null) {
|
||||||
|
continue layer;
|
||||||
|
}
|
||||||
|
fromGet = true;
|
||||||
|
ordinal = replacedOrdinal = get[i];
|
||||||
|
}
|
||||||
|
if (ordinal == BlockTypesCache.ReservedIDs.__RESERVED__) {
|
||||||
|
continue;
|
||||||
|
} else if (!fromGet) { // if fromGet, don't do the same again
|
||||||
|
if (get == null) {
|
||||||
|
get = getBlocks.load(layer);
|
||||||
|
}
|
||||||
|
replacedOrdinal = get[i];
|
||||||
|
}
|
||||||
|
boolean ticking = BlockTypesCache.ticking[ordinal];
|
||||||
|
boolean replacedWasTicking = BlockTypesCache.ticking[replacedOrdinal];
|
||||||
|
boolean replacedWasLiquid = false;
|
||||||
|
BlockState replacedState = null;
|
||||||
|
if (!ticking) {
|
||||||
|
// If the block being replaced was not ticking, it cannot be a liquid
|
||||||
|
if (!replacedWasTicking) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// If the block being replaced is not fluid, we do not need to worry
|
||||||
|
if (!(replacedWasLiquid =
|
||||||
|
(replacedState = BlockState.getFromOrdinal(replacedOrdinal)).getMaterial().isLiquid())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BlockState state = BlockState.getFromOrdinal(ordinal);
|
||||||
|
boolean liquid = state.getMaterial().isLiquid();
|
||||||
|
int x = i & 15;
|
||||||
|
int y = (i >> 8) & 15;
|
||||||
|
int z = (i >> 4) & 15;
|
||||||
|
BlockPos position = new BlockPos((chunk.getX() << 4) + x, (layer << 4) + y, (chunk.getZ() << 4) + z);
|
||||||
|
if (liquid || replacedWasLiquid) {
|
||||||
|
if (liquid) {
|
||||||
|
addFluid(getBlocks.serverLevel, state, position);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// If the replaced fluid (is?) adjacent to water. Do not bother to check adjacent chunks(sections) as this
|
||||||
|
// may be time consuming. Chances are any fluid blocks in adjacent chunks are being replaced or will end up
|
||||||
|
// being ticked anyway. We only need it to be "hit" once.
|
||||||
|
if (!wasAdjacentToWater(get, set, i, x, y, z)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
addFluid(getBlocks.serverLevel, replacedState, position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public Extent construct(final Extent child) {
|
||||||
|
throw new UnsupportedOperationException("Processing only");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ProcessorScope getScope() {
|
||||||
|
return ProcessorScope.READING_SET_BLOCKS;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean wasAdjacentToWater(char[] get, char[] set, int i, int x, int y, int z) {
|
||||||
|
if (set == null || get == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
char ordinal;
|
||||||
|
char reserved = BlockTypesCache.ReservedIDs.__RESERVED__;
|
||||||
|
if (x > 0 && set[i - 1] != reserved) {
|
||||||
|
if (BlockTypesCache.ticking[(ordinal = get[i - 1])] && isFluid(ordinal)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (x < 15 && set[i + 1] != reserved) {
|
||||||
|
if (BlockTypesCache.ticking[(ordinal = get[i + 1])] && isFluid(ordinal)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (z > 0 && set[i - 16] != reserved) {
|
||||||
|
if (BlockTypesCache.ticking[(ordinal = get[i - 16])] && isFluid(ordinal)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (z < 15 && set[i + 16] != reserved) {
|
||||||
|
if (BlockTypesCache.ticking[(ordinal = get[i + 16])] && isFluid(ordinal)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (y > 0 && set[i - 256] != reserved) {
|
||||||
|
if (BlockTypesCache.ticking[(ordinal = get[i - 256])] && isFluid(ordinal)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (y < 15 && set[i + 256] != reserved) {
|
||||||
|
return BlockTypesCache.ticking[(ordinal = get[i + 256])] && isFluid(ordinal);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
private boolean isFluid(char ordinal) {
|
||||||
|
return BlockState.getFromOrdinal(ordinal).getMaterial().isLiquid();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
private void addFluid(final ServerLevel serverLevel, final BlockState replacedState, final BlockPos position) {
|
||||||
|
Fluid type;
|
||||||
|
if (replacedState.getBlockType() == BlockTypes.LAVA) {
|
||||||
|
type = (int) replacedState.getState(PropertyKey.LEVEL) == 0 ? Fluids.LAVA : Fluids.FLOWING_LAVA;
|
||||||
|
} else {
|
||||||
|
type = (int) replacedState.getState(PropertyKey.LEVEL) == 0 ? Fluids.WATER : Fluids.FLOWING_WATER;
|
||||||
|
}
|
||||||
|
serverLevel.scheduleTick(
|
||||||
|
position,
|
||||||
|
type,
|
||||||
|
type.getTickDelay(serverLevel)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,205 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.configuration.Settings;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.NMSRelighter;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
|
||||||
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
|
import com.fastasyncworldedit.core.util.MathMan;
|
||||||
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
|
import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
|
||||||
|
import it.unimi.dsi.fastutil.longs.LongArraySet;
|
||||||
|
import it.unimi.dsi.fastutil.longs.LongIterator;
|
||||||
|
import it.unimi.dsi.fastutil.longs.LongSet;
|
||||||
|
import net.minecraft.server.level.ChunkMap;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.TicketType;
|
||||||
|
import net.minecraft.util.Unit;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkStatus;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
import java.util.function.IntConsumer;
|
||||||
|
|
||||||
|
public class PaperweightStarlightRelighter implements Relighter {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LogManagerCompat.getLogger();
|
||||||
|
private static final int CHUNKS_PER_BATCH = 1024; // 32 * 32
|
||||||
|
private static final int CHUNKS_PER_BATCH_SQRT_LOG2 = 5; // for shifting
|
||||||
|
|
||||||
|
private static final TicketType<Unit> FAWE_TICKET = TicketType.create("fawe_ticket", (a, b) -> 0);
|
||||||
|
private static final int LIGHT_LEVEL = ChunkMap.MAX_VIEW_DISTANCE + ChunkStatus.getDistance(ChunkStatus.LIGHT);
|
||||||
|
|
||||||
|
|
||||||
|
private final ServerLevel serverLevel;
|
||||||
|
private final ReentrantLock lock = new ReentrantLock();
|
||||||
|
private final Long2ObjectLinkedOpenHashMap<LongSet> regions = new Long2ObjectLinkedOpenHashMap<>();
|
||||||
|
private final ReentrantLock areaLock = new ReentrantLock();
|
||||||
|
private final NMSRelighter delegate;
|
||||||
|
|
||||||
|
@SuppressWarnings("rawtypes")
|
||||||
|
public PaperweightStarlightRelighter(ServerLevel serverLevel, IQueueExtent<IQueueChunk> queue) {
|
||||||
|
this.serverLevel = serverLevel;
|
||||||
|
this.delegate = new NMSRelighter(queue);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean addChunk(int cx, int cz, byte[] skipReason, int bitmask) {
|
||||||
|
areaLock.lock();
|
||||||
|
try {
|
||||||
|
long key = MathMan.pairInt(cx >> CHUNKS_PER_BATCH_SQRT_LOG2, cz >> CHUNKS_PER_BATCH_SQRT_LOG2);
|
||||||
|
// TODO probably submit here already if chunks.size == CHUNKS_PER_BATCH?
|
||||||
|
LongSet chunks = this.regions.computeIfAbsent(key, k -> new LongArraySet(CHUNKS_PER_BATCH >> 2));
|
||||||
|
chunks.add(ChunkPos.asLong(cx, cz));
|
||||||
|
} finally {
|
||||||
|
areaLock.unlock();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addLightUpdate(int x, int y, int z) {
|
||||||
|
delegate.addLightUpdate(x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This method is called "recursively", iterating and removing elements
|
||||||
|
* from the regions linked map. This way, chunks are loaded in batches to avoid
|
||||||
|
* OOMEs.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void fixLightingSafe(boolean sky) {
|
||||||
|
this.areaLock.lock();
|
||||||
|
try {
|
||||||
|
if (regions.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LongSet first = regions.removeFirst();
|
||||||
|
fixLighting(first, () -> fixLightingSafe(true));
|
||||||
|
} finally {
|
||||||
|
this.areaLock.unlock();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Processes a set of chunks and runs an action afterwards.
|
||||||
|
* The action is run async, the chunks are partly processed on the main thread
|
||||||
|
* (as required by the server).
|
||||||
|
*/
|
||||||
|
private void fixLighting(LongSet chunks, Runnable andThen) {
|
||||||
|
// convert from long keys to ChunkPos
|
||||||
|
Set<ChunkPos> coords = new HashSet<>();
|
||||||
|
LongIterator iterator = chunks.iterator();
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
coords.add(new ChunkPos(iterator.nextLong()));
|
||||||
|
}
|
||||||
|
TaskManager.taskManager().task(() -> {
|
||||||
|
// trigger chunk load and apply ticket on main thread
|
||||||
|
List<CompletableFuture<?>> futures = new ArrayList<>();
|
||||||
|
for (ChunkPos pos : coords) {
|
||||||
|
futures.add(serverLevel.getWorld().getChunkAtAsync(pos.x, pos.z)
|
||||||
|
.thenAccept(c -> serverLevel.getChunkSource().addTicketAtLevel(
|
||||||
|
FAWE_TICKET,
|
||||||
|
pos,
|
||||||
|
LIGHT_LEVEL,
|
||||||
|
Unit.INSTANCE
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// collect futures and trigger relight once all chunks are loaded
|
||||||
|
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).thenAccept(v ->
|
||||||
|
invokeRelight(
|
||||||
|
coords,
|
||||||
|
c -> {
|
||||||
|
}, // no callback for single chunks required
|
||||||
|
i -> {
|
||||||
|
if (i != coords.size()) {
|
||||||
|
LOGGER.warn("Processed {} chunks instead of {}", i, coords.size());
|
||||||
|
}
|
||||||
|
// post process chunks on main thread
|
||||||
|
TaskManager.taskManager().task(() -> postProcessChunks(coords));
|
||||||
|
// call callback on our own threads
|
||||||
|
TaskManager.taskManager().async(andThen);
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void invokeRelight(
|
||||||
|
Set<ChunkPos> coords,
|
||||||
|
Consumer<ChunkPos> chunkCallback,
|
||||||
|
IntConsumer processCallback
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
serverLevel.getChunkSource().getLightEngine().relight(coords, chunkCallback, processCallback);
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("Error occurred on relighting", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Allow the server to unload the chunks again.
|
||||||
|
* Also, if chunk packets are sent delayed, we need to do that here
|
||||||
|
*/
|
||||||
|
private void postProcessChunks(Set<ChunkPos> coords) {
|
||||||
|
boolean delay = Settings.settings().LIGHTING.DELAY_PACKET_SENDING;
|
||||||
|
for (ChunkPos pos : coords) {
|
||||||
|
int x = pos.x;
|
||||||
|
int z = pos.z;
|
||||||
|
if (delay) { // we still need to send the block changes of that chunk
|
||||||
|
PaperweightPlatformAdapter.sendChunk(serverLevel, x, z, false);
|
||||||
|
}
|
||||||
|
serverLevel.getChunkSource().removeTicketAtLevel(FAWE_TICKET, pos, LIGHT_LEVEL, Unit.INSTANCE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void clear() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removeLighting() {
|
||||||
|
this.delegate.removeLighting();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void fixBlockLighting() {
|
||||||
|
fixLightingSafe(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void fixSkyLighting() {
|
||||||
|
fixLightingSafe(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ReentrantLock getLock() {
|
||||||
|
return this.lock;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isFinished() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void close() throws Exception {
|
||||||
|
fixLightingSafe(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.NullRelighter;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.Relighter;
|
||||||
|
import com.fastasyncworldedit.core.extent.processor.lighting.RelighterFactory;
|
||||||
|
import com.fastasyncworldedit.core.queue.IQueueChunk;
|
||||||
|
import com.fastasyncworldedit.core.queue.IQueueExtent;
|
||||||
|
import com.sk89q.worldedit.world.World;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
|
||||||
|
|
||||||
|
import javax.annotation.Nonnull;
|
||||||
|
|
||||||
|
public class PaperweightStarlightRelighterFactory implements RelighterFactory {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nonnull
|
||||||
|
@SuppressWarnings("rawtypes")
|
||||||
|
Relighter createRelighter(RelightMode relightMode, World world, IQueueExtent<IQueueChunk> queue) {
|
||||||
|
org.bukkit.World w = Bukkit.getWorld(world.getName());
|
||||||
|
if (w == null) {
|
||||||
|
return NullRelighter.INSTANCE;
|
||||||
|
}
|
||||||
|
return new PaperweightStarlightRelighter(((CraftWorld) w).getHandle(), queue);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,161 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.nbt;
|
||||||
|
|
||||||
|
import com.sk89q.jnbt.CompoundTag;
|
||||||
|
import com.sk89q.jnbt.LazyCompoundTag;
|
||||||
|
import com.sk89q.jnbt.ListTag;
|
||||||
|
import com.sk89q.jnbt.StringTag;
|
||||||
|
import com.sk89q.jnbt.Tag;
|
||||||
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
|
import com.sk89q.worldedit.util.nbt.CompoundBinaryTag;
|
||||||
|
import net.minecraft.nbt.NumericTag;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public class PaperweightLazyCompoundTag extends LazyCompoundTag {
|
||||||
|
|
||||||
|
private final Supplier<net.minecraft.nbt.CompoundTag> compoundTagSupplier;
|
||||||
|
private CompoundTag compoundTag;
|
||||||
|
|
||||||
|
public PaperweightLazyCompoundTag(Supplier<net.minecraft.nbt.CompoundTag> compoundTagSupplier) {
|
||||||
|
super(new HashMap<>());
|
||||||
|
this.compoundTagSupplier = compoundTagSupplier;
|
||||||
|
}
|
||||||
|
|
||||||
|
public PaperweightLazyCompoundTag(net.minecraft.nbt.CompoundTag compoundTag) {
|
||||||
|
this(() -> compoundTag);
|
||||||
|
}
|
||||||
|
|
||||||
|
public net.minecraft.nbt.CompoundTag get() {
|
||||||
|
return compoundTagSupplier.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public Map<String, Tag> getValue() {
|
||||||
|
if (compoundTag == null) {
|
||||||
|
compoundTag = (CompoundTag) WorldEditPlugin.getInstance().getBukkitImplAdapter().toNative(compoundTagSupplier.get());
|
||||||
|
}
|
||||||
|
return compoundTag.getValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompoundBinaryTag asBinaryTag() {
|
||||||
|
getValue();
|
||||||
|
return compoundTag.asBinaryTag();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean containsKey(String key) {
|
||||||
|
return compoundTagSupplier.get().contains(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] getByteArray(String key) {
|
||||||
|
return compoundTagSupplier.get().getByteArray(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte getByte(String key) {
|
||||||
|
return compoundTagSupplier.get().getByte(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getDouble(String key) {
|
||||||
|
return compoundTagSupplier.get().getDouble(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double asDouble(String key) {
|
||||||
|
net.minecraft.nbt.Tag tag = compoundTagSupplier.get().get(key);
|
||||||
|
if (tag instanceof NumericTag numTag) {
|
||||||
|
return numTag.getAsDouble();
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getFloat(String key) {
|
||||||
|
return compoundTagSupplier.get().getFloat(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int[] getIntArray(String key) {
|
||||||
|
return compoundTagSupplier.get().getIntArray(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getInt(String key) {
|
||||||
|
return compoundTagSupplier.get().getInt(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int asInt(String key) {
|
||||||
|
net.minecraft.nbt.Tag tag = compoundTagSupplier.get().get(key);
|
||||||
|
if (tag instanceof NumericTag numTag) {
|
||||||
|
return numTag.getAsInt();
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public List<Tag> getList(String key) {
|
||||||
|
net.minecraft.nbt.Tag tag = compoundTagSupplier.get().get(key);
|
||||||
|
if (tag instanceof net.minecraft.nbt.ListTag nbtList) {
|
||||||
|
ArrayList<Tag> list = new ArrayList<>();
|
||||||
|
for (net.minecraft.nbt.Tag elem : nbtList) {
|
||||||
|
if (elem instanceof net.minecraft.nbt.CompoundTag compoundTag) {
|
||||||
|
list.add(new PaperweightLazyCompoundTag(compoundTag));
|
||||||
|
} else {
|
||||||
|
list.add(WorldEditPlugin.getInstance().getBukkitImplAdapter().toNative(elem));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public ListTag getListTag(String key) {
|
||||||
|
net.minecraft.nbt.Tag tag = compoundTagSupplier.get().get(key);
|
||||||
|
if (tag instanceof net.minecraft.nbt.ListTag) {
|
||||||
|
return (ListTag) WorldEditPlugin.getInstance().getBukkitImplAdapter().toNative(tag);
|
||||||
|
}
|
||||||
|
return new ListTag(StringTag.class, Collections.emptyList());
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public <T extends Tag> List<T> getList(String key, Class<T> listType) {
|
||||||
|
ListTag listTag = getListTag(key);
|
||||||
|
if (listTag.getType().equals(listType)) {
|
||||||
|
return (List<T>) listTag.getValue();
|
||||||
|
} else {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public long[] getLongArray(String key) {
|
||||||
|
return compoundTagSupplier.get().getLongArray(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getLong(String key) {
|
||||||
|
return compoundTagSupplier.get().getLong(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public long asLong(String key) {
|
||||||
|
net.minecraft.nbt.Tag tag = compoundTagSupplier.get().get(key);
|
||||||
|
if (tag instanceof NumericTag numTag) {
|
||||||
|
return numTag.getAsLong();
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public short getShort(String key) {
|
||||||
|
return compoundTagSupplier.get().getShort(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getString(String key) {
|
||||||
|
return compoundTagSupplier.get().getString(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return compoundTagSupplier.get().toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,594 @@
|
|||||||
|
package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.regen;
|
||||||
|
|
||||||
|
import com.fastasyncworldedit.bukkit.adapter.Regenerator;
|
||||||
|
import com.fastasyncworldedit.core.Fawe;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkCache;
|
||||||
|
import com.fastasyncworldedit.core.queue.IChunkGet;
|
||||||
|
import com.fastasyncworldedit.core.util.ReflectionUtils;
|
||||||
|
import com.fastasyncworldedit.core.util.TaskManager;
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
|
import com.mojang.datafixers.util.Either;
|
||||||
|
import com.mojang.serialization.Lifecycle;
|
||||||
|
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.Refraction;
|
||||||
|
import com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R1.PaperweightGetBlocks;
|
||||||
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
|
import com.sk89q.worldedit.internal.util.LogManagerCompat;
|
||||||
|
import com.sk89q.worldedit.regions.Region;
|
||||||
|
import com.sk89q.worldedit.util.io.file.SafeFiles;
|
||||||
|
import com.sk89q.worldedit.world.RegenOptions;
|
||||||
|
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.Registry;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.server.dedicated.DedicatedServer;
|
||||||
|
import net.minecraft.server.level.ChunkMap;
|
||||||
|
import net.minecraft.server.level.ChunkTaskPriorityQueueSorter.Message;
|
||||||
|
import net.minecraft.server.level.ServerChunkCache;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.server.level.ThreadedLevelLightEngine;
|
||||||
|
import net.minecraft.server.level.progress.ChunkProgressListener;
|
||||||
|
import net.minecraft.util.thread.ProcessorHandle;
|
||||||
|
import net.minecraft.util.thread.ProcessorMailbox;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.Level;
|
||||||
|
import net.minecraft.world.level.LevelHeightAccessor;
|
||||||
|
import net.minecraft.world.level.LevelSettings;
|
||||||
|
import net.minecraft.world.level.biome.Biome;
|
||||||
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
|
import net.minecraft.world.level.biome.FixedBiomeSource;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGeneratorStructureState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkStatus;
|
||||||
|
import net.minecraft.world.level.chunk.LevelChunk;
|
||||||
|
import net.minecraft.world.level.chunk.ProtoChunk;
|
||||||
|
import net.minecraft.world.level.chunk.UpgradeData;
|
||||||
|
import net.minecraft.world.level.dimension.LevelStem;
|
||||||
|
import net.minecraft.world.level.levelgen.FlatLevelSource;
|
||||||
|
import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
||||||
|
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||||
|
import net.minecraft.world.level.levelgen.WorldOptions;
|
||||||
|
import net.minecraft.world.level.levelgen.blending.BlendingData;
|
||||||
|
import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.placement.ConcentricRingsStructurePlacement;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
|
||||||
|
import net.minecraft.world.level.storage.LevelStorageSource;
|
||||||
|
import net.minecraft.world.level.storage.PrimaryLevelData;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Chunk;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftServer;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_20_R1.generator.CustomChunkGenerator;
|
||||||
|
import org.bukkit.generator.BiomeProvider;
|
||||||
|
import org.bukkit.generator.BlockPopulator;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.OptionalLong;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
import static net.minecraft.core.registries.Registries.BIOME;
|
||||||
|
|
||||||
|
public class PaperweightRegen extends Regenerator<ChunkAccess, ProtoChunk, LevelChunk, PaperweightRegen.ChunkStatusWrap> {
|
||||||
|
|
||||||
|
private static final Logger LOGGER = LogManagerCompat.getLogger();
|
||||||
|
|
||||||
|
private static final Field serverWorldsField;
|
||||||
|
private static final Field paperConfigField;
|
||||||
|
private static final Field flatBedrockField;
|
||||||
|
private static final Field generatorSettingFlatField;
|
||||||
|
private static final Field generatorSettingBaseSupplierField;
|
||||||
|
private static final Field delegateField;
|
||||||
|
private static final Field chunkSourceField;
|
||||||
|
private static final Field generatorStructureStateField;
|
||||||
|
private static final Field ringPositionsField;
|
||||||
|
private static final Field hasGeneratedPositionsField;
|
||||||
|
|
||||||
|
//list of chunk stati in correct order without FULL
|
||||||
|
private static final Map<ChunkStatus, Concurrency> chunkStati = new LinkedHashMap<>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
chunkStati.put(ChunkStatus.EMPTY, Concurrency.FULL); // empty: radius -1, does nothing
|
||||||
|
chunkStati.put(ChunkStatus.STRUCTURE_STARTS, Concurrency.NONE); // structure starts: uses unsynchronized maps
|
||||||
|
chunkStati.put(
|
||||||
|
ChunkStatus.STRUCTURE_REFERENCES,
|
||||||
|
Concurrency.FULL
|
||||||
|
); // structure refs: radius 8, but only writes to current chunk
|
||||||
|
chunkStati.put(ChunkStatus.BIOMES, Concurrency.FULL); // biomes: radius 0
|
||||||
|
chunkStati.put(ChunkStatus.NOISE, Concurrency.RADIUS); // noise: radius 8
|
||||||
|
chunkStati.put(ChunkStatus.SURFACE, Concurrency.NONE); // surface: radius 0, requires NONE
|
||||||
|
chunkStati.put(ChunkStatus.CARVERS, Concurrency.NONE); // carvers: radius 0, but RADIUS and FULL change results
|
||||||
|
/*chunkStati.put(
|
||||||
|
ChunkStatus.LIQUID_CARVERS,
|
||||||
|
Concurrency.NONE
|
||||||
|
); // liquid carvers: radius 0, but RADIUS and FULL change results*/
|
||||||
|
chunkStati.put(ChunkStatus.FEATURES, Concurrency.NONE); // features: uses unsynchronized maps
|
||||||
|
chunkStati.put(
|
||||||
|
ChunkStatus.LIGHT,
|
||||||
|
Concurrency.FULL
|
||||||
|
); // light: radius 1, but no writes to other chunks, only current chunk
|
||||||
|
chunkStati.put(ChunkStatus.SPAWN, Concurrency.FULL); // spawn: radius 0
|
||||||
|
// chunkStati.put(ChunkStatus.HEIGHTMAPS, Concurrency.FULL); // heightmaps: radius 0
|
||||||
|
|
||||||
|
try {
|
||||||
|
serverWorldsField = CraftServer.class.getDeclaredField("worlds");
|
||||||
|
serverWorldsField.setAccessible(true);
|
||||||
|
|
||||||
|
Field tmpPaperConfigField;
|
||||||
|
Field tmpFlatBedrockField;
|
||||||
|
try { //only present on paper
|
||||||
|
tmpPaperConfigField = Level.class.getDeclaredField("paperConfig");
|
||||||
|
tmpPaperConfigField.setAccessible(true);
|
||||||
|
|
||||||
|
tmpFlatBedrockField = tmpPaperConfigField.getType().getDeclaredField("generateFlatBedrock");
|
||||||
|
tmpFlatBedrockField.setAccessible(true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
tmpPaperConfigField = null;
|
||||||
|
tmpFlatBedrockField = null;
|
||||||
|
}
|
||||||
|
paperConfigField = tmpPaperConfigField;
|
||||||
|
flatBedrockField = tmpFlatBedrockField;
|
||||||
|
|
||||||
|
generatorSettingBaseSupplierField = NoiseBasedChunkGenerator.class.getDeclaredField(Refraction.pickName(
|
||||||
|
"settings", "e"));
|
||||||
|
generatorSettingBaseSupplierField.setAccessible(true);
|
||||||
|
|
||||||
|
generatorSettingFlatField = FlatLevelSource.class.getDeclaredField(Refraction.pickName("settings", "d"));
|
||||||
|
generatorSettingFlatField.setAccessible(true);
|
||||||
|
|
||||||
|
delegateField = CustomChunkGenerator.class.getDeclaredField("delegate");
|
||||||
|
delegateField.setAccessible(true);
|
||||||
|
|
||||||
|
chunkSourceField = ServerLevel.class.getDeclaredField(Refraction.pickName("chunkSource", "I"));
|
||||||
|
chunkSourceField.setAccessible(true);
|
||||||
|
|
||||||
|
generatorStructureStateField = ChunkMap.class.getDeclaredField(Refraction.pickName("chunkGeneratorState", "v"));
|
||||||
|
generatorStructureStateField.setAccessible(true);
|
||||||
|
|
||||||
|
ringPositionsField = ChunkGeneratorStructureState.class.getDeclaredField(Refraction.pickName("ringPositions", "g"));
|
||||||
|
ringPositionsField.setAccessible(true);
|
||||||
|
|
||||||
|
hasGeneratedPositionsField = ChunkGeneratorStructureState.class.getDeclaredField(
|
||||||
|
Refraction.pickName("hasGeneratedPositions", "h")
|
||||||
|
);
|
||||||
|
hasGeneratedPositionsField.setAccessible(true);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//runtime
|
||||||
|
private ServerLevel originalServerWorld;
|
||||||
|
private ServerChunkCache originalChunkProvider;
|
||||||
|
private ServerLevel freshWorld;
|
||||||
|
private ServerChunkCache freshChunkProvider;
|
||||||
|
private LevelStorageSource.LevelStorageAccess session;
|
||||||
|
private StructureTemplateManager structureTemplateManager;
|
||||||
|
private ThreadedLevelLightEngine threadedLevelLightEngine;
|
||||||
|
private ChunkGenerator chunkGenerator;
|
||||||
|
|
||||||
|
private Path tempDir;
|
||||||
|
|
||||||
|
private boolean generateFlatBedrock = false;
|
||||||
|
|
||||||
|
public PaperweightRegen(org.bukkit.World originalBukkitWorld, Region region, Extent target, RegenOptions options) {
|
||||||
|
super(originalBukkitWorld, region, target, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean prepare() {
|
||||||
|
this.originalServerWorld = ((CraftWorld) originalBukkitWorld).getHandle();
|
||||||
|
originalChunkProvider = originalServerWorld.getChunkSource();
|
||||||
|
if (!(originalChunkProvider instanceof ServerChunkCache)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
//flat bedrock? (only on paper)
|
||||||
|
if (paperConfigField != null) {
|
||||||
|
try {
|
||||||
|
generateFlatBedrock = flatBedrockField.getBoolean(paperConfigField.get(originalServerWorld));
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
seed = options.getSeed().orElse(originalServerWorld.getSeed());
|
||||||
|
chunkStati.forEach((s, c) -> super.chunkStati.put(new ChunkStatusWrap(s), c));
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
protected boolean initNewWorld() throws Exception {
|
||||||
|
//world folder
|
||||||
|
tempDir = java.nio.file.Files.createTempDirectory("FastAsyncWorldEditWorldGen");
|
||||||
|
|
||||||
|
//prepare for world init (see upstream implementation for reference)
|
||||||
|
org.bukkit.World.Environment environment = originalBukkitWorld.getEnvironment();
|
||||||
|
org.bukkit.generator.ChunkGenerator generator = originalBukkitWorld.getGenerator();
|
||||||
|
LevelStorageSource levelStorageSource = LevelStorageSource.createDefault(tempDir);
|
||||||
|
ResourceKey<LevelStem> levelStemResourceKey = getWorldDimKey(environment);
|
||||||
|
session = levelStorageSource.createAccess("faweregentempworld", levelStemResourceKey);
|
||||||
|
PrimaryLevelData originalWorldData = originalServerWorld.serverLevelData;
|
||||||
|
|
||||||
|
MinecraftServer server = originalServerWorld.getCraftServer().getServer();
|
||||||
|
WorldOptions originalOpts = originalWorldData.worldGenOptions();
|
||||||
|
WorldOptions newOpts = options.getSeed().isPresent()
|
||||||
|
? originalOpts.withSeed(OptionalLong.of(seed))
|
||||||
|
: originalOpts;
|
||||||
|
LevelSettings newWorldSettings = new LevelSettings(
|
||||||
|
"faweregentempworld",
|
||||||
|
originalWorldData.settings.gameType(),
|
||||||
|
originalWorldData.settings.hardcore(),
|
||||||
|
originalWorldData.settings.difficulty(),
|
||||||
|
originalWorldData.settings.allowCommands(),
|
||||||
|
originalWorldData.settings.gameRules(),
|
||||||
|
originalWorldData.settings.getDataConfiguration()
|
||||||
|
);
|
||||||
|
|
||||||
|
PrimaryLevelData.SpecialWorldProperty specialWorldProperty =
|
||||||
|
originalWorldData.isFlatWorld()
|
||||||
|
? PrimaryLevelData.SpecialWorldProperty.FLAT
|
||||||
|
: originalWorldData.isDebugWorld()
|
||||||
|
? PrimaryLevelData.SpecialWorldProperty.DEBUG
|
||||||
|
: PrimaryLevelData.SpecialWorldProperty.NONE;
|
||||||
|
PrimaryLevelData newWorldData = new PrimaryLevelData(newWorldSettings, newOpts, specialWorldProperty, Lifecycle.stable());
|
||||||
|
|
||||||
|
BiomeProvider biomeProvider = getBiomeProvider();
|
||||||
|
|
||||||
|
|
||||||
|
//init world
|
||||||
|
freshWorld = Fawe.instance().getQueueHandler().sync((Supplier<ServerLevel>) () -> new ServerLevel(
|
||||||
|
server,
|
||||||
|
server.executor,
|
||||||
|
session,
|
||||||
|
newWorldData,
|
||||||
|
originalServerWorld.dimension(),
|
||||||
|
DedicatedServer.getServer().registryAccess().registry(Registries.LEVEL_STEM).orElseThrow()
|
||||||
|
.getOrThrow(levelStemResourceKey),
|
||||||
|
new RegenNoOpWorldLoadListener(),
|
||||||
|
originalServerWorld.isDebug(),
|
||||||
|
seed,
|
||||||
|
ImmutableList.of(),
|
||||||
|
false,
|
||||||
|
originalServerWorld.getRandomSequences(),
|
||||||
|
environment,
|
||||||
|
generator,
|
||||||
|
biomeProvider
|
||||||
|
) {
|
||||||
|
|
||||||
|
private final Holder<Biome> singleBiome = options.hasBiomeType() ? DedicatedServer.getServer().registryAccess()
|
||||||
|
.registryOrThrow(BIOME).asHolderIdMap().byIdOrThrow(
|
||||||
|
WorldEditPlugin.getInstance().getBukkitImplAdapter().getInternalBiomeId(options.getBiomeType())
|
||||||
|
) : null;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void tick(BooleanSupplier shouldKeepTicking) { //no ticking
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Holder<Biome> getUncachedNoiseBiome(int biomeX, int biomeY, int biomeZ) {
|
||||||
|
if (options.hasBiomeType()) {
|
||||||
|
return singleBiome;
|
||||||
|
}
|
||||||
|
return PaperweightRegen.this.chunkGenerator.getBiomeSource().getNoiseBiome(
|
||||||
|
biomeX, biomeY, biomeZ, getChunkSource().randomState().sampler()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}).get();
|
||||||
|
freshWorld.noSave = true;
|
||||||
|
removeWorldFromWorldsMap();
|
||||||
|
newWorldData.checkName(originalServerWorld.serverLevelData.getLevelName()); //rename to original world name
|
||||||
|
if (paperConfigField != null) {
|
||||||
|
paperConfigField.set(freshWorld, originalServerWorld.paperConfig());
|
||||||
|
}
|
||||||
|
|
||||||
|
ChunkGenerator originalGenerator = originalChunkProvider.getGenerator();
|
||||||
|
if (originalGenerator instanceof FlatLevelSource flatLevelSource) {
|
||||||
|
FlatLevelGeneratorSettings generatorSettingFlat = flatLevelSource.settings();
|
||||||
|
chunkGenerator = new FlatLevelSource(generatorSettingFlat);
|
||||||
|
} else if (originalGenerator instanceof NoiseBasedChunkGenerator noiseBasedChunkGenerator) {
|
||||||
|
Holder<NoiseGeneratorSettings> generatorSettingBaseSupplier = (Holder<NoiseGeneratorSettings>) generatorSettingBaseSupplierField.get(
|
||||||
|
originalGenerator);
|
||||||
|
BiomeSource biomeSource;
|
||||||
|
if (options.hasBiomeType()) {
|
||||||
|
|
||||||
|
biomeSource = new FixedBiomeSource(
|
||||||
|
DedicatedServer.getServer().registryAccess()
|
||||||
|
.registryOrThrow(BIOME).asHolderIdMap().byIdOrThrow(
|
||||||
|
WorldEditPlugin.getInstance().getBukkitImplAdapter().getInternalBiomeId(options.getBiomeType())
|
||||||
|
)
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
biomeSource = originalGenerator.getBiomeSource();
|
||||||
|
}
|
||||||
|
chunkGenerator = new NoiseBasedChunkGenerator(
|
||||||
|
biomeSource,
|
||||||
|
generatorSettingBaseSupplier
|
||||||
|
);
|
||||||
|
} else if (originalGenerator instanceof CustomChunkGenerator customChunkGenerator) {
|
||||||
|
chunkGenerator = customChunkGenerator.getDelegate();
|
||||||
|
} else {
|
||||||
|
LOGGER.error("Unsupported generator type {}", originalGenerator.getClass().getName());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (generator != null) {
|
||||||
|
chunkGenerator = new CustomChunkGenerator(freshWorld, chunkGenerator, generator);
|
||||||
|
generateConcurrent = generator.isParallelCapable();
|
||||||
|
}
|
||||||
|
// chunkGenerator.conf = freshWorld.spigotConfig; - Does not exist anymore, may need to be re-addressed
|
||||||
|
|
||||||
|
freshChunkProvider = new ServerChunkCache(
|
||||||
|
freshWorld,
|
||||||
|
session,
|
||||||
|
server.getFixerUpper(),
|
||||||
|
server.getStructureManager(),
|
||||||
|
server.executor,
|
||||||
|
chunkGenerator,
|
||||||
|
freshWorld.spigotConfig.viewDistance,
|
||||||
|
freshWorld.spigotConfig.simulationDistance,
|
||||||
|
server.forceSynchronousWrites(),
|
||||||
|
new RegenNoOpWorldLoadListener(),
|
||||||
|
(chunkCoordIntPair, state) -> {
|
||||||
|
},
|
||||||
|
() -> server.overworld().getDataStorage()
|
||||||
|
) {
|
||||||
|
// redirect to LevelChunks created in #createChunks
|
||||||
|
@Override
|
||||||
|
public ChunkAccess getChunk(int x, int z, ChunkStatus chunkstatus, boolean create) {
|
||||||
|
ChunkAccess chunkAccess = getChunkAt(x, z);
|
||||||
|
if (chunkAccess == null && create) {
|
||||||
|
chunkAccess = createChunk(getProtoChunkAt(x, z));
|
||||||
|
}
|
||||||
|
return chunkAccess;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (seed == originalOpts.seed() && !options.hasBiomeType()) {
|
||||||
|
// Optimisation for needless ring position calculation when the seed and biome is the same.
|
||||||
|
ChunkGeneratorStructureState state = (ChunkGeneratorStructureState) generatorStructureStateField.get(originalChunkProvider.chunkMap);
|
||||||
|
boolean hasGeneratedPositions = hasGeneratedPositionsField.getBoolean(state);
|
||||||
|
if (hasGeneratedPositions) {
|
||||||
|
Map<ConcentricRingsStructurePlacement, CompletableFuture<List<ChunkPos>>> origPositions =
|
||||||
|
(Map<ConcentricRingsStructurePlacement, CompletableFuture<List<ChunkPos>>>) ringPositionsField.get(state);
|
||||||
|
Map<ConcentricRingsStructurePlacement, CompletableFuture<List<ChunkPos>>> copy = new Object2ObjectArrayMap<>(
|
||||||
|
origPositions);
|
||||||
|
ChunkGeneratorStructureState newState = (ChunkGeneratorStructureState) generatorStructureStateField.get(freshChunkProvider.chunkMap);
|
||||||
|
ringPositionsField.set(newState, copy);
|
||||||
|
hasGeneratedPositionsField.setBoolean(newState, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ReflectionUtils.unsafeSet(chunkSourceField, freshWorld, freshChunkProvider);
|
||||||
|
//let's start then
|
||||||
|
structureTemplateManager = server.getStructureManager();
|
||||||
|
threadedLevelLightEngine = new NoOpLightEngine(freshChunkProvider);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void cleanup() {
|
||||||
|
try {
|
||||||
|
session.close();
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
|
||||||
|
//shutdown chunk provider
|
||||||
|
try {
|
||||||
|
Fawe.instance().getQueueHandler().sync(() -> {
|
||||||
|
try {
|
||||||
|
freshChunkProvider.close(false);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
|
||||||
|
//remove world from server
|
||||||
|
try {
|
||||||
|
Fawe.instance().getQueueHandler().sync(this::removeWorldFromWorldsMap);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
|
||||||
|
//delete directory
|
||||||
|
try {
|
||||||
|
SafeFiles.tryHardToDeleteDir(tempDir);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ProtoChunk createProtoChunk(int x, int z) {
|
||||||
|
return new FastProtoChunk(new ChunkPos(x, z), UpgradeData.EMPTY, freshWorld,
|
||||||
|
this.freshWorld.registryAccess().registryOrThrow(BIOME), null
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected LevelChunk createChunk(ProtoChunk protoChunk) {
|
||||||
|
return new LevelChunk(
|
||||||
|
freshWorld,
|
||||||
|
protoChunk,
|
||||||
|
null // we don't want to add entities
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ChunkStatusWrap getFullChunkStatus() {
|
||||||
|
return new ChunkStatusWrap(ChunkStatus.FULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected List<BlockPopulator> getBlockPopulators() {
|
||||||
|
return originalServerWorld.getWorld().getPopulators();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void populate(LevelChunk levelChunk, Random random, BlockPopulator blockPopulator) {
|
||||||
|
// BlockPopulator#populate has to be called synchronously for TileEntity access
|
||||||
|
TaskManager.taskManager().task(() -> {
|
||||||
|
final CraftWorld world = freshWorld.getWorld();
|
||||||
|
final Chunk chunk = world.getChunkAt(levelChunk.locX, levelChunk.locZ);
|
||||||
|
blockPopulator.populate(world, random, chunk);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected IChunkCache<IChunkGet> initSourceQueueCache() {
|
||||||
|
return (chunkX, chunkZ) -> new PaperweightGetBlocks(freshWorld, chunkX, chunkZ) {
|
||||||
|
@Override
|
||||||
|
public LevelChunk ensureLoaded(ServerLevel nmsWorld, int x, int z) {
|
||||||
|
return getChunkAt(x, z);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
//util
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private void removeWorldFromWorldsMap() {
|
||||||
|
Fawe.instance().getQueueHandler().sync(() -> {
|
||||||
|
try {
|
||||||
|
Map<String, org.bukkit.World> map = (Map<String, org.bukkit.World>) serverWorldsField.get(Bukkit.getServer());
|
||||||
|
map.remove("faweregentempworld");
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private ResourceKey<LevelStem> getWorldDimKey(org.bukkit.World.Environment env) {
|
||||||
|
return switch (env) {
|
||||||
|
case NETHER -> LevelStem.NETHER;
|
||||||
|
case THE_END -> LevelStem.END;
|
||||||
|
default -> LevelStem.OVERWORLD;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class RegenNoOpWorldLoadListener implements ChunkProgressListener {
|
||||||
|
|
||||||
|
private RegenNoOpWorldLoadListener() {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateSpawnPos(ChunkPos spawnPos) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStatusChange(ChunkPos pos, @Nullable ChunkStatus status) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void stop() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO Paper only(?) @Override
|
||||||
|
public void setChunkRadius(int radius) {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private class FastProtoChunk extends ProtoChunk {
|
||||||
|
|
||||||
|
public FastProtoChunk(
|
||||||
|
final ChunkPos pos,
|
||||||
|
final UpgradeData upgradeData,
|
||||||
|
final LevelHeightAccessor world,
|
||||||
|
final Registry<Biome> biomeRegistry,
|
||||||
|
@Nullable final BlendingData blendingData
|
||||||
|
) {
|
||||||
|
super(pos, upgradeData, world, biomeRegistry, blendingData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// avoid warning on paper
|
||||||
|
|
||||||
|
// compatibility with spigot
|
||||||
|
|
||||||
|
public boolean generateFlatBedrock() {
|
||||||
|
return generateFlatBedrock;
|
||||||
|
}
|
||||||
|
|
||||||
|
// no one will ever see the entities!
|
||||||
|
@Override
|
||||||
|
public List<CompoundTag> getEntities() {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
protected class ChunkStatusWrap extends ChunkStatusWrapper<ChunkAccess> {
|
||||||
|
|
||||||
|
private final ChunkStatus chunkStatus;
|
||||||
|
|
||||||
|
public ChunkStatusWrap(ChunkStatus chunkStatus) {
|
||||||
|
this.chunkStatus = chunkStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int requiredNeighborChunkRadius() {
|
||||||
|
return chunkStatus.getRange();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String name() {
|
||||||
|
return chunkStatus.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<?> processChunk(Long xz, List<ChunkAccess> accessibleChunks) {
|
||||||
|
return chunkStatus.generate(
|
||||||
|
Runnable::run, // TODO revisit, we might profit from this somehow?
|
||||||
|
freshWorld,
|
||||||
|
chunkGenerator,
|
||||||
|
structureTemplateManager,
|
||||||
|
threadedLevelLightEngine,
|
||||||
|
c -> CompletableFuture.completedFuture(Either.left(c)),
|
||||||
|
accessibleChunks
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A light engine that does nothing. As light is calculated after pasting anyway, we can avoid
|
||||||
|
* work this way.
|
||||||
|
*/
|
||||||
|
static class NoOpLightEngine extends ThreadedLevelLightEngine {
|
||||||
|
|
||||||
|
private static final ProcessorMailbox<Runnable> MAILBOX = ProcessorMailbox.create(task -> {
|
||||||
|
}, "fawe-no-op");
|
||||||
|
private static final ProcessorHandle<Message<Runnable>> HANDLE = ProcessorHandle.of("fawe-no-op", m -> {
|
||||||
|
});
|
||||||
|
|
||||||
|
public NoOpLightEngine(final ServerChunkCache chunkProvider) {
|
||||||
|
super(chunkProvider, chunkProvider.chunkMap, false, MAILBOX, HANDLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<ChunkAccess> lightChunk(final ChunkAccess chunk, final boolean excludeBlocks) {
|
||||||
|
return CompletableFuture.completedFuture(chunk);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -3,7 +3,7 @@ import io.papermc.paperweight.userdev.attribute.Obfuscation
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
`java-library`
|
`java-library`
|
||||||
id("com.modrinth.minotaur") version "2.7.5"
|
id("com.modrinth.minotaur") version "2.8.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
project.description = "Bukkit"
|
project.description = "Bukkit"
|
||||||
@ -206,7 +206,7 @@ tasks {
|
|||||||
versionNumber.set("${project.version}")
|
versionNumber.set("${project.version}")
|
||||||
versionType.set("release")
|
versionType.set("release")
|
||||||
uploadFile.set(file("build/libs/${rootProject.name}-Bukkit-${project.version}.jar"))
|
uploadFile.set(file("build/libs/${rootProject.name}-Bukkit-${project.version}.jar"))
|
||||||
gameVersions.addAll(listOf("1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19", "1.18.2", "1.17.1", "1.16.5"))
|
gameVersions.addAll(listOf("1.20", "1.19.4", "1.19.3", "1.19.2", "1.19.1", "1.19", "1.18.2", "1.17.1", "1.16.5"))
|
||||||
loaders.addAll(listOf("paper", "spigot"))
|
loaders.addAll(listOf("paper", "spigot"))
|
||||||
changelog.set("The changelog is available on GitHub: https://github.com/IntellectualSites/" +
|
changelog.set("The changelog is available on GitHub: https://github.com/IntellectualSites/" +
|
||||||
"FastAsyncWorldEdit/releases/tag/${project.version}")
|
"FastAsyncWorldEdit/releases/tag/${project.version}")
|
||||||
|
@ -12,7 +12,7 @@ applyPlatformAndCoreConfiguration()
|
|||||||
dependencies {
|
dependencies {
|
||||||
constraints {
|
constraints {
|
||||||
implementation("org.yaml:snakeyaml") {
|
implementation("org.yaml:snakeyaml") {
|
||||||
version { strictly("1.33") }
|
version { strictly("2.0") }
|
||||||
because("Bukkit provides SnakeYaml")
|
because("Bukkit provides SnakeYaml")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -28,7 +28,8 @@ dependencies {
|
|||||||
implementation("com.google.code.gson:gson")
|
implementation("com.google.code.gson:gson")
|
||||||
|
|
||||||
// Platform expectations
|
// Platform expectations
|
||||||
implementation("org.yaml:snakeyaml")
|
// TODO update bom-newest
|
||||||
|
implementation("org.yaml:snakeyaml:2.0")
|
||||||
|
|
||||||
// Logging
|
// Logging
|
||||||
implementation("org.apache.logging.log4j:log4j-api")
|
implementation("org.apache.logging.log4j:log4j-api")
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.fastasyncworldedit.core.configuration.file;
|
package com.fastasyncworldedit.core.configuration.file;
|
||||||
|
|
||||||
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerialization;
|
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerialization;
|
||||||
|
import org.yaml.snakeyaml.LoaderOptions;
|
||||||
import org.yaml.snakeyaml.constructor.SafeConstructor;
|
import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||||
import org.yaml.snakeyaml.error.YAMLException;
|
import org.yaml.snakeyaml.error.YAMLException;
|
||||||
import org.yaml.snakeyaml.nodes.Node;
|
import org.yaml.snakeyaml.nodes.Node;
|
||||||
@ -12,6 +13,7 @@ import java.util.Map;
|
|||||||
public class YamlConstructor extends SafeConstructor {
|
public class YamlConstructor extends SafeConstructor {
|
||||||
|
|
||||||
public YamlConstructor() {
|
public YamlConstructor() {
|
||||||
|
super(new LoaderOptions());
|
||||||
yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
|
yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@ package com.fastasyncworldedit.core.configuration.file;
|
|||||||
import com.fastasyncworldedit.core.configuration.ConfigurationSection;
|
import com.fastasyncworldedit.core.configuration.ConfigurationSection;
|
||||||
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerializable;
|
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerializable;
|
||||||
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerialization;
|
import com.fastasyncworldedit.core.configuration.serialization.ConfigurationSerialization;
|
||||||
|
import org.yaml.snakeyaml.DumperOptions;
|
||||||
import org.yaml.snakeyaml.nodes.Node;
|
import org.yaml.snakeyaml.nodes.Node;
|
||||||
import org.yaml.snakeyaml.representer.Representer;
|
import org.yaml.snakeyaml.representer.Representer;
|
||||||
|
|
||||||
@ -12,6 +13,7 @@ import java.util.Map;
|
|||||||
public class YamlRepresenter extends Representer {
|
public class YamlRepresenter extends Representer {
|
||||||
|
|
||||||
public YamlRepresenter() {
|
public YamlRepresenter() {
|
||||||
|
super(new DumperOptions());
|
||||||
this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
|
this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
|
||||||
this.multiRepresenters.put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
|
this.multiRepresenters.put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ public class YAMLProcessor extends YAMLNode {
|
|||||||
// pre-1.32 snakeyaml
|
// pre-1.32 snakeyaml
|
||||||
}
|
}
|
||||||
|
|
||||||
yaml = new Yaml(new SafeConstructor(), representer, dumperOptions, loaderOptions);
|
yaml = new Yaml(new SafeConstructor(new LoaderOptions()), representer, dumperOptions, loaderOptions);
|
||||||
|
|
||||||
this.file = file;
|
this.file = file;
|
||||||
}
|
}
|
||||||
@ -310,6 +310,7 @@ public class YAMLProcessor extends YAMLNode {
|
|||||||
private static class FancyRepresenter extends Representer {
|
private static class FancyRepresenter extends Representer {
|
||||||
|
|
||||||
private FancyRepresenter() {
|
private FancyRepresenter() {
|
||||||
|
super(new DumperOptions());
|
||||||
this.nullRepresenter = o -> representScalar(Tag.NULL, "");
|
this.nullRepresenter = o -> representScalar(Tag.NULL, "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,4 +81,9 @@ public final class Constants {
|
|||||||
*/
|
*/
|
||||||
public static final int DATA_VERSION_MC_1_19 = 3105;
|
public static final int DATA_VERSION_MC_1_19 = 3105;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The DataVersion for Minecraft 1.20
|
||||||
|
*/
|
||||||
|
public static final int DATA_VERSION_MC_1_20 = 3463;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -50,6 +50,8 @@ public final class BiomeTypes {
|
|||||||
@Deprecated
|
@Deprecated
|
||||||
public static final BiomeType BIRCH_FOREST_HILLS = get("minecraft:birch_forest_hills");
|
public static final BiomeType BIRCH_FOREST_HILLS = get("minecraft:birch_forest_hills");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BiomeType CHERRY_GROVE = get("minecraft:cherry_grove");
|
||||||
|
@Nullable
|
||||||
public static final BiomeType COLD_OCEAN = get("minecraft:cold_ocean");
|
public static final BiomeType COLD_OCEAN = get("minecraft:cold_ocean");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BiomeType CRIMSON_FOREST = get("minecraft:crimson_forest");
|
public static final BiomeType CRIMSON_FOREST = get("minecraft:crimson_forest");
|
||||||
@ -137,6 +139,9 @@ public final class BiomeTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static final BiomeType MODIFIED_BADLANDS_PLATEAU = get("minecraft:modified_badlands_plateau");
|
public static final BiomeType MODIFIED_BADLANDS_PLATEAU = get("minecraft:modified_badlands_plateau");
|
||||||
|
@Deprecated
|
||||||
|
@Nullable
|
||||||
|
public static final BiomeType MODIFIED_GRAVELLY_HILLS = get("minecraft:modified_gravelly_hills");
|
||||||
@Nullable
|
@Nullable
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static final BiomeType MODIFIED_GRAVELLY_MOUNTAINS = get("minecraft:modified_gravelly_mountains");
|
public static final BiomeType MODIFIED_GRAVELLY_MOUNTAINS = get("minecraft:modified_gravelly_mountains");
|
||||||
|
@ -28,12 +28,15 @@ package com.sk89q.worldedit.world.block;
|
|||||||
public final class BlockCategories {
|
public final class BlockCategories {
|
||||||
|
|
||||||
public static final BlockCategory ACACIA_LOGS = get("minecraft:acacia_logs");
|
public static final BlockCategory ACACIA_LOGS = get("minecraft:acacia_logs");
|
||||||
|
public static final BlockCategory ALL_HANGING_SIGNS = get("minecraft:all_hanging_signs");
|
||||||
|
public static final BlockCategory ALL_SIGNS = get("minecraft:all_signs");
|
||||||
public static final BlockCategory ANCIENT_CITY_REPLACEABLE = get("minecraft:ancient_city_replaceable");
|
public static final BlockCategory ANCIENT_CITY_REPLACEABLE = get("minecraft:ancient_city_replaceable");
|
||||||
public static final BlockCategory ANIMALS_SPAWNABLE_ON = get("minecraft:animals_spawnable_on");
|
public static final BlockCategory ANIMALS_SPAWNABLE_ON = get("minecraft:animals_spawnable_on");
|
||||||
public static final BlockCategory ANVIL = get("minecraft:anvil");
|
public static final BlockCategory ANVIL = get("minecraft:anvil");
|
||||||
public static final BlockCategory AXOLOTLS_SPAWNABLE_ON = get("minecraft:axolotls_spawnable_on");
|
public static final BlockCategory AXOLOTLS_SPAWNABLE_ON = get("minecraft:axolotls_spawnable_on");
|
||||||
public static final BlockCategory AZALEA_GROWS_ON = get("minecraft:azalea_grows_on");
|
public static final BlockCategory AZALEA_GROWS_ON = get("minecraft:azalea_grows_on");
|
||||||
public static final BlockCategory AZALEA_ROOT_REPLACEABLE = get("minecraft:azalea_root_replaceable");
|
public static final BlockCategory AZALEA_ROOT_REPLACEABLE = get("minecraft:azalea_root_replaceable");
|
||||||
|
public static final BlockCategory BAMBOO_BLOCKS = get("minecraft:bamboo_blocks");
|
||||||
public static final BlockCategory BAMBOO_PLANTABLE_ON = get("minecraft:bamboo_plantable_on");
|
public static final BlockCategory BAMBOO_PLANTABLE_ON = get("minecraft:bamboo_plantable_on");
|
||||||
public static final BlockCategory BANNERS = get("minecraft:banners");
|
public static final BlockCategory BANNERS = get("minecraft:banners");
|
||||||
public static final BlockCategory BASE_STONE_NETHER = get("minecraft:base_stone_nether");
|
public static final BlockCategory BASE_STONE_NETHER = get("minecraft:base_stone_nether");
|
||||||
@ -51,8 +54,11 @@ public final class BlockCategories {
|
|||||||
@Deprecated public static final BlockCategory CARPETS = get("minecraft:carpets");
|
@Deprecated public static final BlockCategory CARPETS = get("minecraft:carpets");
|
||||||
public static final BlockCategory CAULDRONS = get("minecraft:cauldrons");
|
public static final BlockCategory CAULDRONS = get("minecraft:cauldrons");
|
||||||
public static final BlockCategory CAVE_VINES = get("minecraft:cave_vines");
|
public static final BlockCategory CAVE_VINES = get("minecraft:cave_vines");
|
||||||
|
public static final BlockCategory CEILING_HANGING_SIGNS = get("minecraft:ceiling_hanging_signs");
|
||||||
|
public static final BlockCategory CHERRY_LOGS = get("minecraft:cherry_logs");
|
||||||
public static final BlockCategory CLIMBABLE = get("minecraft:climbable");
|
public static final BlockCategory CLIMBABLE = get("minecraft:climbable");
|
||||||
public static final BlockCategory COAL_ORES = get("minecraft:coal_ores");
|
public static final BlockCategory COAL_ORES = get("minecraft:coal_ores");
|
||||||
|
public static final BlockCategory COMBINATION_STEP_SOUND_BLOCKS = get("minecraft:combination_step_sound_blocks");
|
||||||
public static final BlockCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
public static final BlockCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
||||||
public static final BlockCategory CONVERTABLE_TO_MUD = get("minecraft:convertable_to_mud");
|
public static final BlockCategory CONVERTABLE_TO_MUD = get("minecraft:convertable_to_mud");
|
||||||
public static final BlockCategory COPPER_ORES = get("minecraft:copper_ores");
|
public static final BlockCategory COPPER_ORES = get("minecraft:copper_ores");
|
||||||
@ -75,6 +81,8 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory DRAGON_TRANSPARENT = get("minecraft:dragon_transparent");
|
public static final BlockCategory DRAGON_TRANSPARENT = get("minecraft:dragon_transparent");
|
||||||
public static final BlockCategory DRIPSTONE_REPLACEABLE_BLOCKS = get("minecraft:dripstone_replaceable_blocks");
|
public static final BlockCategory DRIPSTONE_REPLACEABLE_BLOCKS = get("minecraft:dripstone_replaceable_blocks");
|
||||||
public static final BlockCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
public static final BlockCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
||||||
|
public static final BlockCategory ENCHANTMENT_POWER_PROVIDER = get("minecraft:enchantment_power_provider");
|
||||||
|
public static final BlockCategory ENCHANTMENT_POWER_TRANSMITTER = get("minecraft:enchantment_power_transmitter");
|
||||||
public static final BlockCategory ENDERMAN_HOLDABLE = get("minecraft:enderman_holdable");
|
public static final BlockCategory ENDERMAN_HOLDABLE = get("minecraft:enderman_holdable");
|
||||||
public static final BlockCategory FALL_DAMAGE_RESETTING = get("minecraft:fall_damage_resetting");
|
public static final BlockCategory FALL_DAMAGE_RESETTING = get("minecraft:fall_damage_resetting");
|
||||||
public static final BlockCategory FEATURES_CANNOT_REPLACE = get("minecraft:features_cannot_replace");
|
public static final BlockCategory FEATURES_CANNOT_REPLACE = get("minecraft:features_cannot_replace");
|
||||||
@ -97,6 +105,7 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory INFINIBURN_NETHER = get("minecraft:infiniburn_nether");
|
public static final BlockCategory INFINIBURN_NETHER = get("minecraft:infiniburn_nether");
|
||||||
public static final BlockCategory INFINIBURN_OVERWORLD = get("minecraft:infiniburn_overworld");
|
public static final BlockCategory INFINIBURN_OVERWORLD = get("minecraft:infiniburn_overworld");
|
||||||
public static final BlockCategory INSIDE_STEP_SOUND_BLOCKS = get("minecraft:inside_step_sound_blocks");
|
public static final BlockCategory INSIDE_STEP_SOUND_BLOCKS = get("minecraft:inside_step_sound_blocks");
|
||||||
|
public static final BlockCategory INVALID_SPAWN_INSIDE = get("minecraft:invalid_spawn_inside");
|
||||||
public static final BlockCategory IRON_ORES = get("minecraft:iron_ores");
|
public static final BlockCategory IRON_ORES = get("minecraft:iron_ores");
|
||||||
public static final BlockCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
|
public static final BlockCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
|
||||||
public static final BlockCategory LAPIS_ORES = get("minecraft:lapis_ores");
|
public static final BlockCategory LAPIS_ORES = get("minecraft:lapis_ores");
|
||||||
@ -106,6 +115,7 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory LOGS = get("minecraft:logs");
|
public static final BlockCategory LOGS = get("minecraft:logs");
|
||||||
public static final BlockCategory LOGS_THAT_BURN = get("minecraft:logs_that_burn");
|
public static final BlockCategory LOGS_THAT_BURN = get("minecraft:logs_that_burn");
|
||||||
public static final BlockCategory LUSH_GROUND_REPLACEABLE = get("minecraft:lush_ground_replaceable");
|
public static final BlockCategory LUSH_GROUND_REPLACEABLE = get("minecraft:lush_ground_replaceable");
|
||||||
|
public static final BlockCategory MAINTAINS_FARMLAND = get("minecraft:maintains_farmland");
|
||||||
public static final BlockCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
public static final BlockCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
||||||
public static final BlockCategory MANGROVE_LOGS_CAN_GROW_THROUGH = get("minecraft:mangrove_logs_can_grow_through");
|
public static final BlockCategory MANGROVE_LOGS_CAN_GROW_THROUGH = get("minecraft:mangrove_logs_can_grow_through");
|
||||||
public static final BlockCategory MANGROVE_ROOTS_CAN_GROW_THROUGH = get("minecraft:mangrove_roots_can_grow_through");
|
public static final BlockCategory MANGROVE_ROOTS_CAN_GROW_THROUGH = get("minecraft:mangrove_roots_can_grow_through");
|
||||||
@ -120,7 +130,6 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory NEEDS_IRON_TOOL = get("minecraft:needs_iron_tool");
|
public static final BlockCategory NEEDS_IRON_TOOL = get("minecraft:needs_iron_tool");
|
||||||
public static final BlockCategory NEEDS_STONE_TOOL = get("minecraft:needs_stone_tool");
|
public static final BlockCategory NEEDS_STONE_TOOL = get("minecraft:needs_stone_tool");
|
||||||
public static final BlockCategory NETHER_CARVER_REPLACEABLES = get("minecraft:nether_carver_replaceables");
|
public static final BlockCategory NETHER_CARVER_REPLACEABLES = get("minecraft:nether_carver_replaceables");
|
||||||
public static final BlockCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
|
|
||||||
public static final BlockCategory NYLIUM = get("minecraft:nylium");
|
public static final BlockCategory NYLIUM = get("minecraft:nylium");
|
||||||
public static final BlockCategory OAK_LOGS = get("minecraft:oak_logs");
|
public static final BlockCategory OAK_LOGS = get("minecraft:oak_logs");
|
||||||
public static final BlockCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
public static final BlockCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
||||||
@ -136,7 +145,9 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory RABBITS_SPAWNABLE_ON = get("minecraft:rabbits_spawnable_on");
|
public static final BlockCategory RABBITS_SPAWNABLE_ON = get("minecraft:rabbits_spawnable_on");
|
||||||
public static final BlockCategory RAILS = get("minecraft:rails");
|
public static final BlockCategory RAILS = get("minecraft:rails");
|
||||||
public static final BlockCategory REDSTONE_ORES = get("minecraft:redstone_ores");
|
public static final BlockCategory REDSTONE_ORES = get("minecraft:redstone_ores");
|
||||||
public static final BlockCategory REPLACEABLE_PLANTS = get("minecraft:replaceable_plants");
|
public static final BlockCategory REPLACEABLE = get("minecraft:replaceable");
|
||||||
|
public static final BlockCategory REPLACEABLE_BY_TREES = get("minecraft:replaceable_by_trees");
|
||||||
|
@Deprecated public static final BlockCategory REPLACEABLE_PLANTS = get("minecraft:replaceable_plants");
|
||||||
public static final BlockCategory SAND = get("minecraft:sand");
|
public static final BlockCategory SAND = get("minecraft:sand");
|
||||||
public static final BlockCategory SAPLINGS = get("minecraft:saplings");
|
public static final BlockCategory SAPLINGS = get("minecraft:saplings");
|
||||||
public static final BlockCategory SCULK_REPLACEABLE = get("minecraft:sculk_replaceable");
|
public static final BlockCategory SCULK_REPLACEABLE = get("minecraft:sculk_replaceable");
|
||||||
@ -146,7 +157,10 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory SLABS = get("minecraft:slabs");
|
public static final BlockCategory SLABS = get("minecraft:slabs");
|
||||||
public static final BlockCategory SMALL_DRIPLEAF_PLACEABLE = get("minecraft:small_dripleaf_placeable");
|
public static final BlockCategory SMALL_DRIPLEAF_PLACEABLE = get("minecraft:small_dripleaf_placeable");
|
||||||
public static final BlockCategory SMALL_FLOWERS = get("minecraft:small_flowers");
|
public static final BlockCategory SMALL_FLOWERS = get("minecraft:small_flowers");
|
||||||
|
public static final BlockCategory SMELTS_TO_GLASS = get("minecraft:smelts_to_glass");
|
||||||
public static final BlockCategory SNAPS_GOAT_HORN = get("minecraft:snaps_goat_horn");
|
public static final BlockCategory SNAPS_GOAT_HORN = get("minecraft:snaps_goat_horn");
|
||||||
|
public static final BlockCategory SNIFFER_DIGGABLE_BLOCK = get("minecraft:sniffer_diggable_block");
|
||||||
|
public static final BlockCategory SNIFFER_EGG_HATCH_BOOST = get("minecraft:sniffer_egg_hatch_boost");
|
||||||
public static final BlockCategory SNOW = get("minecraft:snow");
|
public static final BlockCategory SNOW = get("minecraft:snow");
|
||||||
public static final BlockCategory SNOW_LAYER_CAN_SURVIVE_ON = get("minecraft:snow_layer_can_survive_on");
|
public static final BlockCategory SNOW_LAYER_CAN_SURVIVE_ON = get("minecraft:snow_layer_can_survive_on");
|
||||||
public static final BlockCategory SNOW_LAYER_CANNOT_SURVIVE_ON = get("minecraft:snow_layer_cannot_survive_on");
|
public static final BlockCategory SNOW_LAYER_CANNOT_SURVIVE_ON = get("minecraft:snow_layer_cannot_survive_on");
|
||||||
@ -156,16 +170,21 @@ public final class BlockCategories {
|
|||||||
public static final BlockCategory STAIRS = get("minecraft:stairs");
|
public static final BlockCategory STAIRS = get("minecraft:stairs");
|
||||||
public static final BlockCategory STANDING_SIGNS = get("minecraft:standing_signs");
|
public static final BlockCategory STANDING_SIGNS = get("minecraft:standing_signs");
|
||||||
public static final BlockCategory STONE_BRICKS = get("minecraft:stone_bricks");
|
public static final BlockCategory STONE_BRICKS = get("minecraft:stone_bricks");
|
||||||
|
public static final BlockCategory STONE_BUTTONS = get("minecraft:stone_buttons");
|
||||||
public static final BlockCategory STONE_ORE_REPLACEABLES = get("minecraft:stone_ore_replaceables");
|
public static final BlockCategory STONE_ORE_REPLACEABLES = get("minecraft:stone_ore_replaceables");
|
||||||
public static final BlockCategory STONE_PRESSURE_PLATES = get("minecraft:stone_pressure_plates");
|
public static final BlockCategory STONE_PRESSURE_PLATES = get("minecraft:stone_pressure_plates");
|
||||||
public static final BlockCategory STRIDER_WARM_BLOCKS = get("minecraft:strider_warm_blocks");
|
public static final BlockCategory STRIDER_WARM_BLOCKS = get("minecraft:strider_warm_blocks");
|
||||||
|
public static final BlockCategory SWORD_EFFICIENT = get("minecraft:sword_efficient");
|
||||||
public static final BlockCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
public static final BlockCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
||||||
public static final BlockCategory TERRACOTTA = get("minecraft:terracotta");
|
public static final BlockCategory TERRACOTTA = get("minecraft:terracotta");
|
||||||
|
public static final BlockCategory TRAIL_RUINS_REPLACEABLE = get("minecraft:trail_ruins_replaceable");
|
||||||
public static final BlockCategory TRAPDOORS = get("minecraft:trapdoors");
|
public static final BlockCategory TRAPDOORS = get("minecraft:trapdoors");
|
||||||
public static final BlockCategory UNDERWATER_BONEMEALS = get("minecraft:underwater_bonemeals");
|
public static final BlockCategory UNDERWATER_BONEMEALS = get("minecraft:underwater_bonemeals");
|
||||||
public static final BlockCategory UNSTABLE_BOTTOM_CENTER = get("minecraft:unstable_bottom_center");
|
public static final BlockCategory UNSTABLE_BOTTOM_CENTER = get("minecraft:unstable_bottom_center");
|
||||||
public static final BlockCategory VALID_SPAWN = get("minecraft:valid_spawn");
|
public static final BlockCategory VALID_SPAWN = get("minecraft:valid_spawn");
|
||||||
|
public static final BlockCategory VIBRATION_RESONATORS = get("minecraft:vibration_resonators");
|
||||||
public static final BlockCategory WALL_CORALS = get("minecraft:wall_corals");
|
public static final BlockCategory WALL_CORALS = get("minecraft:wall_corals");
|
||||||
|
public static final BlockCategory WALL_HANGING_SIGNS = get("minecraft:wall_hanging_signs");
|
||||||
public static final BlockCategory WALL_POST_OVERRIDE = get("minecraft:wall_post_override");
|
public static final BlockCategory WALL_POST_OVERRIDE = get("minecraft:wall_post_override");
|
||||||
public static final BlockCategory WALL_SIGNS = get("minecraft:wall_signs");
|
public static final BlockCategory WALL_SIGNS = get("minecraft:wall_signs");
|
||||||
public static final BlockCategory WALLS = get("minecraft:walls");
|
public static final BlockCategory WALLS = get("minecraft:walls");
|
||||||
|
@ -55,6 +55,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType ACACIA_FENCE_GATE = init();
|
public static final BlockType ACACIA_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType ACACIA_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType ACACIA_LEAVES = init();
|
public static final BlockType ACACIA_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType ACACIA_LOG = init();
|
public static final BlockType ACACIA_LOG = init();
|
||||||
@ -73,6 +75,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType ACACIA_TRAPDOOR = init();
|
public static final BlockType ACACIA_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType ACACIA_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType ACACIA_WALL_SIGN = init();
|
public static final BlockType ACACIA_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType ACACIA_WOOD = init();
|
public static final BlockType ACACIA_WOOD = init();
|
||||||
@ -111,8 +115,42 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BAMBOO = init();
|
public static final BlockType BAMBOO = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_BLOCK = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_BUTTON = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_DOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_FENCE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_FENCE_GATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_MOSAIC = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_MOSAIC_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_MOSAIC_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_PLANKS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_PRESSURE_PLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType BAMBOO_SAPLING = init();
|
public static final BlockType BAMBOO_SAPLING = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_TRAPDOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType BAMBOO_WALL_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType BARREL = init();
|
public static final BlockType BARREL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BARRIER = init();
|
public static final BlockType BARRIER = init();
|
||||||
@ -143,6 +181,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BIRCH_FENCE_GATE = init();
|
public static final BlockType BIRCH_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType BIRCH_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType BIRCH_LEAVES = init();
|
public static final BlockType BIRCH_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BIRCH_LOG = init();
|
public static final BlockType BIRCH_LOG = init();
|
||||||
@ -161,6 +201,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BIRCH_TRAPDOOR = init();
|
public static final BlockType BIRCH_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType BIRCH_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType BIRCH_WALL_SIGN = init();
|
public static final BlockType BIRCH_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType BIRCH_WOOD = init();
|
public static final BlockType BIRCH_WOOD = init();
|
||||||
@ -307,6 +349,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CALCITE = init();
|
public static final BlockType CALCITE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType CALIBRATED_SCULK_SENSOR = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType CAMPFIRE = init();
|
public static final BlockType CAMPFIRE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CANDLE = init();
|
public static final BlockType CANDLE = init();
|
||||||
@ -331,10 +375,46 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CHAIN_COMMAND_BLOCK = init();
|
public static final BlockType CHAIN_COMMAND_BLOCK = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_BUTTON = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_DOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_FENCE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_FENCE_GATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_LEAVES = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_LOG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_PLANKS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_PRESSURE_PLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_SAPLING = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_TRAPDOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_WALL_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType CHERRY_WOOD = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType CHEST = init();
|
public static final BlockType CHEST = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CHIPPED_ANVIL = init();
|
public static final BlockType CHIPPED_ANVIL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType CHISELED_BOOKSHELF = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType CHISELED_DEEPSLATE = init();
|
public static final BlockType CHISELED_DEEPSLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CHISELED_NETHER_BRICKS = init();
|
public static final BlockType CHISELED_NETHER_BRICKS = init();
|
||||||
@ -419,6 +499,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CRIMSON_FUNGUS = init();
|
public static final BlockType CRIMSON_FUNGUS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType CRIMSON_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType CRIMSON_HYPHAE = init();
|
public static final BlockType CRIMSON_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CRIMSON_NYLIUM = init();
|
public static final BlockType CRIMSON_NYLIUM = init();
|
||||||
@ -439,6 +521,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CRIMSON_TRAPDOOR = init();
|
public static final BlockType CRIMSON_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType CRIMSON_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType CRIMSON_WALL_SIGN = init();
|
public static final BlockType CRIMSON_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType CRYING_OBSIDIAN = init();
|
public static final BlockType CRYING_OBSIDIAN = init();
|
||||||
@ -497,6 +581,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_FENCE_GATE = init();
|
public static final BlockType DARK_OAK_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType DARK_OAK_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_LEAVES = init();
|
public static final BlockType DARK_OAK_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_LOG = init();
|
public static final BlockType DARK_OAK_LOG = init();
|
||||||
@ -515,6 +601,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_TRAPDOOR = init();
|
public static final BlockType DARK_OAK_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType DARK_OAK_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_WALL_SIGN = init();
|
public static final BlockType DARK_OAK_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DARK_OAK_WOOD = init();
|
public static final BlockType DARK_OAK_WOOD = init();
|
||||||
@ -569,6 +657,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DEAD_TUBE_CORAL_WALL_FAN = init();
|
public static final BlockType DEAD_TUBE_CORAL_WALL_FAN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType DECORATED_POT = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType DEEPSLATE = init();
|
public static final BlockType DEEPSLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType DEEPSLATE_BRICKS = init();
|
public static final BlockType DEEPSLATE_BRICKS = init();
|
||||||
@ -843,6 +933,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType JUNGLE_FENCE_GATE = init();
|
public static final BlockType JUNGLE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType JUNGLE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType JUNGLE_LEAVES = init();
|
public static final BlockType JUNGLE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType JUNGLE_LOG = init();
|
public static final BlockType JUNGLE_LOG = init();
|
||||||
@ -861,6 +953,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType JUNGLE_TRAPDOOR = init();
|
public static final BlockType JUNGLE_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType JUNGLE_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType JUNGLE_WALL_SIGN = init();
|
public static final BlockType JUNGLE_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType JUNGLE_WOOD = init();
|
public static final BlockType JUNGLE_WOOD = init();
|
||||||
@ -1027,6 +1121,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType MANGROVE_FENCE_GATE = init();
|
public static final BlockType MANGROVE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType MANGROVE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType MANGROVE_LEAVES = init();
|
public static final BlockType MANGROVE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType MANGROVE_LOG = init();
|
public static final BlockType MANGROVE_LOG = init();
|
||||||
@ -1047,6 +1143,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType MANGROVE_TRAPDOOR = init();
|
public static final BlockType MANGROVE_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType MANGROVE_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType MANGROVE_WALL_SIGN = init();
|
public static final BlockType MANGROVE_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType MANGROVE_WOOD = init();
|
public static final BlockType MANGROVE_WOOD = init();
|
||||||
@ -1131,6 +1229,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType OAK_FENCE_GATE = init();
|
public static final BlockType OAK_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType OAK_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType OAK_LEAVES = init();
|
public static final BlockType OAK_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType OAK_LOG = init();
|
public static final BlockType OAK_LOG = init();
|
||||||
@ -1149,6 +1249,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType OAK_TRAPDOOR = init();
|
public static final BlockType OAK_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType OAK_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType OAK_WALL_SIGN = init();
|
public static final BlockType OAK_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType OAK_WOOD = init();
|
public static final BlockType OAK_WOOD = init();
|
||||||
@ -1209,6 +1311,10 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PETRIFIED_OAK_SLAB = init();
|
public static final BlockType PETRIFIED_OAK_SLAB = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType PIGLIN_HEAD = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType PIGLIN_WALL_HEAD = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType PINK_BANNER = init();
|
public static final BlockType PINK_BANNER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PINK_BED = init();
|
public static final BlockType PINK_BED = init();
|
||||||
@ -1225,6 +1331,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PINK_GLAZED_TERRACOTTA = init();
|
public static final BlockType PINK_GLAZED_TERRACOTTA = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType PINK_PETALS = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType PINK_SHULKER_BOX = init();
|
public static final BlockType PINK_SHULKER_BOX = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PINK_STAINED_GLASS = init();
|
public static final BlockType PINK_STAINED_GLASS = init();
|
||||||
@ -1243,6 +1351,10 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PISTON_HEAD = init();
|
public static final BlockType PISTON_HEAD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType PITCHER_CROP = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType PITCHER_PLANT = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType PLAYER_HEAD = init();
|
public static final BlockType PLAYER_HEAD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType PLAYER_WALL_HEAD = init();
|
public static final BlockType PLAYER_WALL_HEAD = init();
|
||||||
@ -1324,6 +1436,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType POTTED_CACTUS = init();
|
public static final BlockType POTTED_CACTUS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType POTTED_CHERRY_SAPLING = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType POTTED_CORNFLOWER = init();
|
public static final BlockType POTTED_CORNFLOWER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType POTTED_CRIMSON_FUNGUS = init();
|
public static final BlockType POTTED_CRIMSON_FUNGUS = init();
|
||||||
@ -1365,6 +1479,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType POTTED_SPRUCE_SAPLING = init();
|
public static final BlockType POTTED_SPRUCE_SAPLING = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType POTTED_TORCHFLOWER = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType POTTED_WARPED_FUNGUS = init();
|
public static final BlockType POTTED_WARPED_FUNGUS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType POTTED_WARPED_ROOTS = init();
|
public static final BlockType POTTED_WARPED_ROOTS = init();
|
||||||
@ -1600,6 +1716,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SMOOTH_STONE_SLAB = init();
|
public static final BlockType SMOOTH_STONE_SLAB = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType SNIFFER_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType SNOW = init();
|
public static final BlockType SNOW = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SNOW_BLOCK = init();
|
public static final BlockType SNOW_BLOCK = init();
|
||||||
@ -1632,6 +1750,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SPRUCE_FENCE_GATE = init();
|
public static final BlockType SPRUCE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType SPRUCE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType SPRUCE_LEAVES = init();
|
public static final BlockType SPRUCE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SPRUCE_LOG = init();
|
public static final BlockType SPRUCE_LOG = init();
|
||||||
@ -1650,6 +1770,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SPRUCE_TRAPDOOR = init();
|
public static final BlockType SPRUCE_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType SPRUCE_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType SPRUCE_WALL_SIGN = init();
|
public static final BlockType SPRUCE_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SPRUCE_WOOD = init();
|
public static final BlockType SPRUCE_WOOD = init();
|
||||||
@ -1680,10 +1802,16 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType STRIPPED_ACACIA_WOOD = init();
|
public static final BlockType STRIPPED_ACACIA_WOOD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType STRIPPED_BAMBOO_BLOCK = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType STRIPPED_BIRCH_LOG = init();
|
public static final BlockType STRIPPED_BIRCH_LOG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType STRIPPED_BIRCH_WOOD = init();
|
public static final BlockType STRIPPED_BIRCH_WOOD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType STRIPPED_CHERRY_LOG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType STRIPPED_CHERRY_WOOD = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType STRIPPED_CRIMSON_HYPHAE = init();
|
public static final BlockType STRIPPED_CRIMSON_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType STRIPPED_CRIMSON_STEM = init();
|
public static final BlockType STRIPPED_CRIMSON_STEM = init();
|
||||||
@ -1720,6 +1848,10 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType SUNFLOWER = init();
|
public static final BlockType SUNFLOWER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType SUSPICIOUS_GRAVEL = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType SUSPICIOUS_SAND = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType SWEET_BERRY_BUSH = init();
|
public static final BlockType SWEET_BERRY_BUSH = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType TALL_GRASS = init();
|
public static final BlockType TALL_GRASS = init();
|
||||||
@ -1736,6 +1868,10 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType TORCH = init();
|
public static final BlockType TORCH = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType TORCHFLOWER = init();
|
||||||
|
@Nullable
|
||||||
|
public static final BlockType TORCHFLOWER_CROP = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType TRAPPED_CHEST = init();
|
public static final BlockType TRAPPED_CHEST = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType TRIPWIRE = init();
|
public static final BlockType TRIPWIRE = init();
|
||||||
@ -1779,6 +1915,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType WARPED_FUNGUS = init();
|
public static final BlockType WARPED_FUNGUS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType WARPED_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType WARPED_HYPHAE = init();
|
public static final BlockType WARPED_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType WARPED_NYLIUM = init();
|
public static final BlockType WARPED_NYLIUM = init();
|
||||||
@ -1799,6 +1937,8 @@ public final class BlockTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType WARPED_TRAPDOOR = init();
|
public static final BlockType WARPED_TRAPDOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final BlockType WARPED_WALL_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final BlockType WARPED_WALL_SIGN = init();
|
public static final BlockType WARPED_WALL_SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final BlockType WARPED_WART_BLOCK = init();
|
public static final BlockType WARPED_WART_BLOCK = init();
|
||||||
@ -1926,6 +2066,8 @@ public final class BlockTypes {
|
|||||||
private static Field[] fieldsTmp;
|
private static Field[] fieldsTmp;
|
||||||
private static int initIndex = 0;
|
private static int initIndex = 0;
|
||||||
|
|
||||||
|
// Init each field
|
||||||
|
// The order is important
|
||||||
public static BlockType init() {
|
public static BlockType init() {
|
||||||
if (fieldsTmp == null) {
|
if (fieldsTmp == null) {
|
||||||
fieldsTmp = BlockTypes.class.getDeclaredFields();
|
fieldsTmp = BlockTypes.class.getDeclaredFields();
|
||||||
@ -1935,6 +2077,7 @@ public final class BlockTypes {
|
|||||||
return BlockType.REGISTRY.get(name);
|
return BlockType.REGISTRY.get(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clears memory after initialization
|
||||||
static {
|
static {
|
||||||
fieldsTmp = null;
|
fieldsTmp = null;
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,12 @@ public final class EntityTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType BLAZE = get("minecraft:blaze");
|
public static final EntityType BLAZE = get("minecraft:blaze");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType BLOCK_DISPLAY = get("minecraft:block_display");
|
||||||
|
@Nullable
|
||||||
public static final EntityType BOAT = get("minecraft:boat");
|
public static final EntityType BOAT = get("minecraft:boat");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType CAMEL = get("minecraft:camel");
|
||||||
|
@Nullable
|
||||||
public static final EntityType CAT = get("minecraft:cat");
|
public static final EntityType CAT = get("minecraft:cat");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType CAVE_SPIDER = get("minecraft:cave_spider");
|
public static final EntityType CAVE_SPIDER = get("minecraft:cave_spider");
|
||||||
@ -135,10 +139,14 @@ public final class EntityTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType ILLUSIONER = get("minecraft:illusioner");
|
public static final EntityType ILLUSIONER = get("minecraft:illusioner");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType INTERACTION = get("minecraft:interaction");
|
||||||
|
@Nullable
|
||||||
public static final EntityType IRON_GOLEM = get("minecraft:iron_golem");
|
public static final EntityType IRON_GOLEM = get("minecraft:iron_golem");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType ITEM = get("minecraft:item");
|
public static final EntityType ITEM = get("minecraft:item");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType ITEM_DISPLAY = get("minecraft:item_display");
|
||||||
|
@Nullable
|
||||||
public static final EntityType ITEM_FRAME = get("minecraft:item_frame");
|
public static final EntityType ITEM_FRAME = get("minecraft:item_frame");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType LEASH_KNOT = get("minecraft:leash_knot");
|
public static final EntityType LEASH_KNOT = get("minecraft:leash_knot");
|
||||||
@ -207,6 +215,8 @@ public final class EntityTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType SMALL_FIREBALL = get("minecraft:small_fireball");
|
public static final EntityType SMALL_FIREBALL = get("minecraft:small_fireball");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType SNIFFER = get("minecraft:sniffer");
|
||||||
|
@Nullable
|
||||||
public static final EntityType SNOW_GOLEM = get("minecraft:snow_golem");
|
public static final EntityType SNOW_GOLEM = get("minecraft:snow_golem");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType SNOWBALL = get("minecraft:snowball");
|
public static final EntityType SNOWBALL = get("minecraft:snowball");
|
||||||
@ -225,6 +235,8 @@ public final class EntityTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType TADPOLE = get("minecraft:tadpole");
|
public static final EntityType TADPOLE = get("minecraft:tadpole");
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final EntityType TEXT_DISPLAY = get("minecraft:text_display");
|
||||||
|
@Nullable
|
||||||
public static final EntityType TNT = get("minecraft:tnt");
|
public static final EntityType TNT = get("minecraft:tnt");
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final EntityType TNT_MINECART = get("minecraft:tnt_minecart");
|
public static final EntityType TNT_MINECART = get("minecraft:tnt_minecart");
|
||||||
|
@ -30,15 +30,20 @@ public final class ItemCategories {
|
|||||||
public static final ItemCategory ACACIA_LOGS = get("minecraft:acacia_logs");
|
public static final ItemCategory ACACIA_LOGS = get("minecraft:acacia_logs");
|
||||||
public static final ItemCategory ANVIL = get("minecraft:anvil");
|
public static final ItemCategory ANVIL = get("minecraft:anvil");
|
||||||
public static final ItemCategory ARROWS = get("minecraft:arrows");
|
public static final ItemCategory ARROWS = get("minecraft:arrows");
|
||||||
|
public static final ItemCategory AXES = get("minecraft:axes");
|
||||||
public static final ItemCategory AXOLOTL_TEMPT_ITEMS = get("minecraft:axolotl_tempt_items");
|
public static final ItemCategory AXOLOTL_TEMPT_ITEMS = get("minecraft:axolotl_tempt_items");
|
||||||
|
public static final ItemCategory BAMBOO_BLOCKS = get("minecraft:bamboo_blocks");
|
||||||
public static final ItemCategory BANNERS = get("minecraft:banners");
|
public static final ItemCategory BANNERS = get("minecraft:banners");
|
||||||
public static final ItemCategory BEACON_PAYMENT_ITEMS = get("minecraft:beacon_payment_items");
|
public static final ItemCategory BEACON_PAYMENT_ITEMS = get("minecraft:beacon_payment_items");
|
||||||
public static final ItemCategory BEDS = get("minecraft:beds");
|
public static final ItemCategory BEDS = get("minecraft:beds");
|
||||||
public static final ItemCategory BIRCH_LOGS = get("minecraft:birch_logs");
|
public static final ItemCategory BIRCH_LOGS = get("minecraft:birch_logs");
|
||||||
public static final ItemCategory BOATS = get("minecraft:boats");
|
public static final ItemCategory BOATS = get("minecraft:boats");
|
||||||
|
public static final ItemCategory BOOKSHELF_BOOKS = get("minecraft:bookshelf_books");
|
||||||
|
public static final ItemCategory BREAKS_DECORATED_POTS = get("minecraft:breaks_decorated_pots");
|
||||||
public static final ItemCategory BUTTONS = get("minecraft:buttons");
|
public static final ItemCategory BUTTONS = get("minecraft:buttons");
|
||||||
public static final ItemCategory CANDLES = get("minecraft:candles");
|
public static final ItemCategory CANDLES = get("minecraft:candles");
|
||||||
@Deprecated public static final ItemCategory CARPETS = get("minecraft:carpets");
|
@Deprecated public static final ItemCategory CARPETS = get("minecraft:carpets");
|
||||||
|
public static final ItemCategory CHERRY_LOGS = get("minecraft:cherry_logs");
|
||||||
public static final ItemCategory CHEST_BOATS = get("minecraft:chest_boats");
|
public static final ItemCategory CHEST_BOATS = get("minecraft:chest_boats");
|
||||||
public static final ItemCategory CLUSTER_MAX_HARVESTABLES = get("minecraft:cluster_max_harvestables");
|
public static final ItemCategory CLUSTER_MAX_HARVESTABLES = get("minecraft:cluster_max_harvestables");
|
||||||
public static final ItemCategory COAL_ORES = get("minecraft:coal_ores");
|
public static final ItemCategory COAL_ORES = get("minecraft:coal_ores");
|
||||||
@ -47,13 +52,17 @@ public final class ItemCategories {
|
|||||||
public static final ItemCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
public static final ItemCategory COMPLETES_FIND_TREE_TUTORIAL = get("minecraft:completes_find_tree_tutorial");
|
||||||
public static final ItemCategory COPPER_ORES = get("minecraft:copper_ores");
|
public static final ItemCategory COPPER_ORES = get("minecraft:copper_ores");
|
||||||
public static final ItemCategory CREEPER_DROP_MUSIC_DISCS = get("minecraft:creeper_drop_music_discs");
|
public static final ItemCategory CREEPER_DROP_MUSIC_DISCS = get("minecraft:creeper_drop_music_discs");
|
||||||
|
public static final ItemCategory CREEPER_IGNITERS = get("minecraft:creeper_igniters");
|
||||||
public static final ItemCategory CRIMSON_STEMS = get("minecraft:crimson_stems");
|
public static final ItemCategory CRIMSON_STEMS = get("minecraft:crimson_stems");
|
||||||
public static final ItemCategory DAMPENS_VIBRATIONS = get("minecraft:dampens_vibrations");
|
public static final ItemCategory DAMPENS_VIBRATIONS = get("minecraft:dampens_vibrations");
|
||||||
public static final ItemCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs");
|
public static final ItemCategory DARK_OAK_LOGS = get("minecraft:dark_oak_logs");
|
||||||
|
public static final ItemCategory DECORATED_POT_INGREDIENTS = get("minecraft:decorated_pot_ingredients");
|
||||||
|
public static final ItemCategory DECORATED_POT_SHERDS = get("minecraft:decorated_pot_sherds");
|
||||||
public static final ItemCategory DIAMOND_ORES = get("minecraft:diamond_ores");
|
public static final ItemCategory DIAMOND_ORES = get("minecraft:diamond_ores");
|
||||||
public static final ItemCategory DIRT = get("minecraft:dirt");
|
public static final ItemCategory DIRT = get("minecraft:dirt");
|
||||||
public static final ItemCategory DOORS = get("minecraft:doors");
|
public static final ItemCategory DOORS = get("minecraft:doors");
|
||||||
public static final ItemCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
public static final ItemCategory EMERALD_ORES = get("minecraft:emerald_ores");
|
||||||
|
public static final ItemCategory FENCE_GATES = get("minecraft:fence_gates");
|
||||||
public static final ItemCategory FENCES = get("minecraft:fences");
|
public static final ItemCategory FENCES = get("minecraft:fences");
|
||||||
public static final ItemCategory FISHES = get("minecraft:fishes");
|
public static final ItemCategory FISHES = get("minecraft:fishes");
|
||||||
public static final ItemCategory FLOWERS = get("minecraft:flowers");
|
public static final ItemCategory FLOWERS = get("minecraft:flowers");
|
||||||
@ -62,6 +71,8 @@ public final class ItemCategories {
|
|||||||
@Deprecated
|
@Deprecated
|
||||||
public static final ItemCategory FURNACE_MATERIALS = get("minecraft:furnace_materials");
|
public static final ItemCategory FURNACE_MATERIALS = get("minecraft:furnace_materials");
|
||||||
public static final ItemCategory GOLD_ORES = get("minecraft:gold_ores");
|
public static final ItemCategory GOLD_ORES = get("minecraft:gold_ores");
|
||||||
|
public static final ItemCategory HANGING_SIGNS = get("minecraft:hanging_signs");
|
||||||
|
public static final ItemCategory HOES = get("minecraft:hoes");
|
||||||
public static final ItemCategory IGNORED_BY_PIGLIN_BABIES = get("minecraft:ignored_by_piglin_babies");
|
public static final ItemCategory IGNORED_BY_PIGLIN_BABIES = get("minecraft:ignored_by_piglin_babies");
|
||||||
public static final ItemCategory IRON_ORES = get("minecraft:iron_ores");
|
public static final ItemCategory IRON_ORES = get("minecraft:iron_ores");
|
||||||
public static final ItemCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
|
public static final ItemCategory JUNGLE_LOGS = get("minecraft:jungle_logs");
|
||||||
@ -73,9 +84,11 @@ public final class ItemCategories {
|
|||||||
public static final ItemCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
public static final ItemCategory MANGROVE_LOGS = get("minecraft:mangrove_logs");
|
||||||
public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
|
public static final ItemCategory MUSIC_DISCS = get("minecraft:music_discs");
|
||||||
public static final ItemCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
|
public static final ItemCategory NON_FLAMMABLE_WOOD = get("minecraft:non_flammable_wood");
|
||||||
|
public static final ItemCategory NOTEBLOCK_TOP_INSTRUMENTS = get("minecraft:noteblock_top_instruments");
|
||||||
public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs");
|
public static final ItemCategory OAK_LOGS = get("minecraft:oak_logs");
|
||||||
@Deprecated public static final ItemCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
@Deprecated public static final ItemCategory OCCLUDES_VIBRATION_SIGNALS = get("minecraft:occludes_vibration_signals");
|
||||||
public static final ItemCategory OVERWORLD_NATURAL_LOGS = get("minecraft:overworld_natural_logs");
|
@Deprecated public static final ItemCategory OVERWORLD_NATURAL_LOGS = get("minecraft:overworld_natural_logs");
|
||||||
|
public static final ItemCategory PICKAXES = get("minecraft:pickaxes");
|
||||||
public static final ItemCategory PIGLIN_FOOD = get("minecraft:piglin_food");
|
public static final ItemCategory PIGLIN_FOOD = get("minecraft:piglin_food");
|
||||||
public static final ItemCategory PIGLIN_LOVED = get("minecraft:piglin_loved");
|
public static final ItemCategory PIGLIN_LOVED = get("minecraft:piglin_loved");
|
||||||
public static final ItemCategory PIGLIN_REPELLENTS = get("minecraft:piglin_repellents");
|
public static final ItemCategory PIGLIN_REPELLENTS = get("minecraft:piglin_repellents");
|
||||||
@ -84,18 +97,28 @@ public final class ItemCategories {
|
|||||||
public static final ItemCategory REDSTONE_ORES = get("minecraft:redstone_ores");
|
public static final ItemCategory REDSTONE_ORES = get("minecraft:redstone_ores");
|
||||||
public static final ItemCategory SAND = get("minecraft:sand");
|
public static final ItemCategory SAND = get("minecraft:sand");
|
||||||
public static final ItemCategory SAPLINGS = get("minecraft:saplings");
|
public static final ItemCategory SAPLINGS = get("minecraft:saplings");
|
||||||
|
public static final ItemCategory SHOVELS = get("minecraft:shovels");
|
||||||
public static final ItemCategory SIGNS = get("minecraft:signs");
|
public static final ItemCategory SIGNS = get("minecraft:signs");
|
||||||
public static final ItemCategory SLABS = get("minecraft:slabs");
|
public static final ItemCategory SLABS = get("minecraft:slabs");
|
||||||
public static final ItemCategory SMALL_FLOWERS = get("minecraft:small_flowers");
|
public static final ItemCategory SMALL_FLOWERS = get("minecraft:small_flowers");
|
||||||
|
public static final ItemCategory SMELTS_TO_GLASS = get("minecraft:smelts_to_glass");
|
||||||
|
public static final ItemCategory SNIFFER_FOOD = get("minecraft:sniffer_food");
|
||||||
public static final ItemCategory SOUL_FIRE_BASE_BLOCKS = get("minecraft:soul_fire_base_blocks");
|
public static final ItemCategory SOUL_FIRE_BASE_BLOCKS = get("minecraft:soul_fire_base_blocks");
|
||||||
public static final ItemCategory SPRUCE_LOGS = get("minecraft:spruce_logs");
|
public static final ItemCategory SPRUCE_LOGS = get("minecraft:spruce_logs");
|
||||||
public static final ItemCategory STAIRS = get("minecraft:stairs");
|
public static final ItemCategory STAIRS = get("minecraft:stairs");
|
||||||
public static final ItemCategory STONE_BRICKS = get("minecraft:stone_bricks");
|
public static final ItemCategory STONE_BRICKS = get("minecraft:stone_bricks");
|
||||||
|
public static final ItemCategory STONE_BUTTONS = get("minecraft:stone_buttons");
|
||||||
public static final ItemCategory STONE_CRAFTING_MATERIALS = get("minecraft:stone_crafting_materials");
|
public static final ItemCategory STONE_CRAFTING_MATERIALS = get("minecraft:stone_crafting_materials");
|
||||||
public static final ItemCategory STONE_TOOL_MATERIALS = get("minecraft:stone_tool_materials");
|
public static final ItemCategory STONE_TOOL_MATERIALS = get("minecraft:stone_tool_materials");
|
||||||
|
public static final ItemCategory SWORDS = get("minecraft:swords");
|
||||||
public static final ItemCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
public static final ItemCategory TALL_FLOWERS = get("minecraft:tall_flowers");
|
||||||
public static final ItemCategory TERRACOTTA = get("minecraft:terracotta");
|
public static final ItemCategory TERRACOTTA = get("minecraft:terracotta");
|
||||||
|
public static final ItemCategory TOOLS = get("minecraft:tools");
|
||||||
public static final ItemCategory TRAPDOORS = get("minecraft:trapdoors");
|
public static final ItemCategory TRAPDOORS = get("minecraft:trapdoors");
|
||||||
|
public static final ItemCategory TRIM_MATERIALS = get("minecraft:trim_materials");
|
||||||
|
public static final ItemCategory TRIM_TEMPLATES = get("minecraft:trim_templates");
|
||||||
|
public static final ItemCategory TRIMMABLE_ARMOR = get("minecraft:trimmable_armor");
|
||||||
|
public static final ItemCategory VILLAGER_PLANTABLE_SEEDS = get("minecraft:villager_plantable_seeds");
|
||||||
public static final ItemCategory WALLS = get("minecraft:walls");
|
public static final ItemCategory WALLS = get("minecraft:walls");
|
||||||
public static final ItemCategory WARPED_STEMS = get("minecraft:warped_stems");
|
public static final ItemCategory WARPED_STEMS = get("minecraft:warped_stems");
|
||||||
public static final ItemCategory WART_BLOCKS = get("minecraft:wart_blocks");
|
public static final ItemCategory WART_BLOCKS = get("minecraft:wart_blocks");
|
||||||
|
@ -49,6 +49,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ACACIA_FENCE_GATE = init();
|
public static final ItemType ACACIA_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType ACACIA_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ACACIA_LEAVES = init();
|
public static final ItemType ACACIA_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ACACIA_LOG = init();
|
public static final ItemType ACACIA_LOG = init();
|
||||||
@ -93,12 +95,18 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ANDESITE_WALL = init();
|
public static final ItemType ANDESITE_WALL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType ANGLER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ANVIL = init();
|
public static final ItemType ANVIL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType APPLE = init();
|
public static final ItemType APPLE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType ARCHER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ARMOR_STAND = init();
|
public static final ItemType ARMOR_STAND = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType ARMS_UP_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ARROW = init();
|
public static final ItemType ARROW = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType AXOLOTL_BUCKET = init();
|
public static final ItemType AXOLOTL_BUCKET = init();
|
||||||
@ -115,6 +123,40 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BAMBOO = init();
|
public static final ItemType BAMBOO = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_BLOCK = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_BUTTON = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_CHEST_RAFT = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_DOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_FENCE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_FENCE_GATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_MOSAIC = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_MOSAIC_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_MOSAIC_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_PLANKS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_PRESSURE_PLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_RAFT = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType BAMBOO_TRAPDOOR = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType BARREL = init();
|
public static final ItemType BARREL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BARRIER = init();
|
public static final ItemType BARRIER = init();
|
||||||
@ -157,6 +199,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BIRCH_FENCE_GATE = init();
|
public static final ItemType BIRCH_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BIRCH_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType BIRCH_LEAVES = init();
|
public static final ItemType BIRCH_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BIRCH_LOG = init();
|
public static final ItemType BIRCH_LOG = init();
|
||||||
@ -211,6 +255,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BLACKSTONE_WALL = init();
|
public static final ItemType BLACKSTONE_WALL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BLADE_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType BLAST_FURNACE = init();
|
public static final ItemType BLAST_FURNACE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BLAZE_POWDER = init();
|
public static final ItemType BLAZE_POWDER = init();
|
||||||
@ -273,6 +319,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BREAD = init();
|
public static final ItemType BREAD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BREWER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType BREWING_STAND = init();
|
public static final ItemType BREWING_STAND = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BRICK = init();
|
public static final ItemType BRICK = init();
|
||||||
@ -313,6 +361,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BROWN_WOOL = init();
|
public static final ItemType BROWN_WOOL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BRUSH = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType BUBBLE_CORAL = init();
|
public static final ItemType BUBBLE_CORAL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BUBBLE_CORAL_BLOCK = init();
|
public static final ItemType BUBBLE_CORAL_BLOCK = init();
|
||||||
@ -325,6 +375,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType BUNDLE = init();
|
public static final ItemType BUNDLE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType BURN_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType CACTUS = init();
|
public static final ItemType CACTUS = init();
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@Nullable
|
@Nullable
|
||||||
@ -334,6 +386,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CALCITE = init();
|
public static final ItemType CALCITE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType CALIBRATED_SCULK_SENSOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CAMEL_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType CAMPFIRE = init();
|
public static final ItemType CAMPFIRE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CANDLE = init();
|
public static final ItemType CANDLE = init();
|
||||||
@ -366,6 +422,40 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CHARCOAL = init();
|
public static final ItemType CHARCOAL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_BOAT = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_BUTTON = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_CHEST_BOAT = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_DOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_FENCE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_FENCE_GATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_LEAVES = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_LOG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_PLANKS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_PRESSURE_PLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_SAPLING = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_SIGN = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_SLAB = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_STAIRS = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_TRAPDOOR = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType CHERRY_WOOD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType CHEST = init();
|
public static final ItemType CHEST = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CHEST_MINECART = init();
|
public static final ItemType CHEST_MINECART = init();
|
||||||
@ -376,6 +466,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CHIPPED_ANVIL = init();
|
public static final ItemType CHIPPED_ANVIL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType CHISELED_BOOKSHELF = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType CHISELED_DEEPSLATE = init();
|
public static final ItemType CHISELED_DEEPSLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CHISELED_NETHER_BRICKS = init();
|
public static final ItemType CHISELED_NETHER_BRICKS = init();
|
||||||
@ -410,6 +502,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType COARSE_DIRT = init();
|
public static final ItemType COARSE_DIRT = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType COAST_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType COBBLED_DEEPSLATE = init();
|
public static final ItemType COBBLED_DEEPSLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType COBBLED_DEEPSLATE_SLAB = init();
|
public static final ItemType COBBLED_DEEPSLATE_SLAB = init();
|
||||||
@ -502,6 +596,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CRIMSON_FUNGUS = init();
|
public static final ItemType CRIMSON_FUNGUS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType CRIMSON_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType CRIMSON_HYPHAE = init();
|
public static final ItemType CRIMSON_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType CRIMSON_NYLIUM = init();
|
public static final ItemType CRIMSON_NYLIUM = init();
|
||||||
@ -573,6 +669,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DANDELION_YELLOW = init();
|
public static final ItemType DANDELION_YELLOW = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType DANGER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType DARK_OAK_BOAT = init();
|
public static final ItemType DARK_OAK_BOAT = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DARK_OAK_BUTTON = init();
|
public static final ItemType DARK_OAK_BUTTON = init();
|
||||||
@ -585,6 +683,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DARK_OAK_FENCE_GATE = init();
|
public static final ItemType DARK_OAK_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType DARK_OAK_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType DARK_OAK_LEAVES = init();
|
public static final ItemType DARK_OAK_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DARK_OAK_LOG = init();
|
public static final ItemType DARK_OAK_LOG = init();
|
||||||
@ -647,6 +747,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DEBUG_STICK = init();
|
public static final ItemType DEBUG_STICK = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType DECORATED_POT = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType DEEPSLATE = init();
|
public static final ItemType DEEPSLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DEEPSLATE_BRICK_SLAB = init();
|
public static final ItemType DEEPSLATE_BRICK_SLAB = init();
|
||||||
@ -745,6 +847,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType DROWNED_SPAWN_EGG = init();
|
public static final ItemType DROWNED_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ECHO_SHARD = init();
|
public static final ItemType ECHO_SHARD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType EGG = init();
|
public static final ItemType EGG = init();
|
||||||
@ -783,6 +887,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ENDER_CHEST = init();
|
public static final ItemType ENDER_CHEST = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType ENDER_DRAGON_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ENDER_EYE = init();
|
public static final ItemType ENDER_EYE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ENDER_PEARL = init();
|
public static final ItemType ENDER_PEARL = init();
|
||||||
@ -795,6 +901,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType EXPERIENCE_BOTTLE = init();
|
public static final ItemType EXPERIENCE_BOTTLE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType EXPLORER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType EXPOSED_COPPER = init();
|
public static final ItemType EXPOSED_COPPER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType EXPOSED_CUT_COPPER = init();
|
public static final ItemType EXPOSED_CUT_COPPER = init();
|
||||||
@ -803,6 +911,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType EXPOSED_CUT_COPPER_STAIRS = init();
|
public static final ItemType EXPOSED_CUT_COPPER_STAIRS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType EYE_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType FARMLAND = init();
|
public static final ItemType FARMLAND = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType FEATHER = init();
|
public static final ItemType FEATHER = init();
|
||||||
@ -843,6 +953,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType FOX_SPAWN_EGG = init();
|
public static final ItemType FOX_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType FRIEND_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType FROG_SPAWN_EGG = init();
|
public static final ItemType FROG_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType FROGSPAWN = init();
|
public static final ItemType FROGSPAWN = init();
|
||||||
@ -998,6 +1110,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType HEART_OF_THE_SEA = init();
|
public static final ItemType HEART_OF_THE_SEA = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType HEART_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType HEARTBREAK_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType HEAVY_WEIGHTED_PRESSURE_PLATE = init();
|
public static final ItemType HEAVY_WEIGHTED_PRESSURE_PLATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType HOGLIN_SPAWN_EGG = init();
|
public static final ItemType HOGLIN_SPAWN_EGG = init();
|
||||||
@ -1022,6 +1138,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType HORSE_SPAWN_EGG = init();
|
public static final ItemType HORSE_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType HOST_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType HOWL_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType HUSK_SPAWN_EGG = init();
|
public static final ItemType HUSK_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ICE = init();
|
public static final ItemType ICE = init();
|
||||||
@ -1054,6 +1174,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType IRON_DOOR = init();
|
public static final ItemType IRON_DOOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType IRON_GOLEM_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType IRON_HELMET = init();
|
public static final ItemType IRON_HELMET = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType IRON_HOE = init();
|
public static final ItemType IRON_HOE = init();
|
||||||
@ -1096,6 +1218,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType JUNGLE_FENCE_GATE = init();
|
public static final ItemType JUNGLE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType JUNGLE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType JUNGLE_LEAVES = init();
|
public static final ItemType JUNGLE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType JUNGLE_LOG = init();
|
public static final ItemType JUNGLE_LOG = init();
|
||||||
@ -1296,6 +1420,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MANGROVE_FENCE_GATE = init();
|
public static final ItemType MANGROVE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType MANGROVE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType MANGROVE_LEAVES = init();
|
public static final ItemType MANGROVE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MANGROVE_LOG = init();
|
public static final ItemType MANGROVE_LOG = init();
|
||||||
@ -1332,6 +1458,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MINECART = init();
|
public static final ItemType MINECART = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType MINER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType MOJANG_BANNER_PATTERN = init();
|
public static final ItemType MOJANG_BANNER_PATTERN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MOOSHROOM_SPAWN_EGG = init();
|
public static final ItemType MOOSHROOM_SPAWN_EGG = init();
|
||||||
@ -1356,6 +1484,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MOSSY_STONE_BRICKS = init();
|
public static final ItemType MOSSY_STONE_BRICKS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType MOURNER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType MUD = init();
|
public static final ItemType MUD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MUD_BRICK_SLAB = init();
|
public static final ItemType MUD_BRICK_SLAB = init();
|
||||||
@ -1396,6 +1526,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MUSIC_DISC_PIGSTEP = init();
|
public static final ItemType MUSIC_DISC_PIGSTEP = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType MUSIC_DISC_RELIC = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType MUSIC_DISC_STAL = init();
|
public static final ItemType MUSIC_DISC_STAL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType MUSIC_DISC_STRAD = init();
|
public static final ItemType MUSIC_DISC_STRAD = init();
|
||||||
@ -1460,6 +1592,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType NETHERITE_SWORD = init();
|
public static final ItemType NETHERITE_SWORD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType NETHERITE_UPGRADE_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType NETHERRACK = init();
|
public static final ItemType NETHERRACK = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType NOTE_BLOCK = init();
|
public static final ItemType NOTE_BLOCK = init();
|
||||||
@ -1476,6 +1610,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType OAK_FENCE_GATE = init();
|
public static final ItemType OAK_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType OAK_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType OAK_LEAVES = init();
|
public static final ItemType OAK_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType OAK_LOG = init();
|
public static final ItemType OAK_LOG = init();
|
||||||
@ -1568,6 +1704,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PIGLIN_BANNER_PATTERN = init();
|
public static final ItemType PIGLIN_BANNER_PATTERN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType PIGLIN_BRUTE_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType PIGLIN_HEAD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType PIGLIN_SPAWN_EGG = init();
|
public static final ItemType PIGLIN_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PILLAGER_SPAWN_EGG = init();
|
public static final ItemType PILLAGER_SPAWN_EGG = init();
|
||||||
@ -1588,6 +1728,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PINK_GLAZED_TERRACOTTA = init();
|
public static final ItemType PINK_GLAZED_TERRACOTTA = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType PINK_PETALS = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType PINK_SHULKER_BOX = init();
|
public static final ItemType PINK_SHULKER_BOX = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PINK_STAINED_GLASS = init();
|
public static final ItemType PINK_STAINED_GLASS = init();
|
||||||
@ -1602,8 +1744,14 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PISTON = init();
|
public static final ItemType PISTON = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType PITCHER_PLANT = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType PITCHER_POD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType PLAYER_HEAD = init();
|
public static final ItemType PLAYER_HEAD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType PLENTY_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType PODZOL = init();
|
public static final ItemType PODZOL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType POINTED_DRIPSTONE = init();
|
public static final ItemType POINTED_DRIPSTONE = init();
|
||||||
@ -1692,6 +1840,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PRISMARINE_WALL = init();
|
public static final ItemType PRISMARINE_WALL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType PRIZE_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType PUFFERFISH = init();
|
public static final ItemType PUFFERFISH = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType PUFFERFISH_BUCKET = init();
|
public static final ItemType PUFFERFISH_BUCKET = init();
|
||||||
@ -1762,6 +1912,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType RAIL = init();
|
public static final ItemType RAIL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType RAVAGER_SPAWN_EGG = init();
|
public static final ItemType RAVAGER_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType RAW_COPPER = init();
|
public static final ItemType RAW_COPPER = init();
|
||||||
@ -1846,6 +1998,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType RESPAWN_ANCHOR = init();
|
public static final ItemType RESPAWN_ANCHOR = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType RIB_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType ROOTED_DIRT = init();
|
public static final ItemType ROOTED_DIRT = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType ROSE_BUSH = init();
|
public static final ItemType ROSE_BUSH = init();
|
||||||
@ -1893,10 +2047,18 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SEAGRASS = init();
|
public static final ItemType SEAGRASS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SHEAF_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SHEARS = init();
|
public static final ItemType SHEARS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SHEEP_SPAWN_EGG = init();
|
public static final ItemType SHEEP_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SHELTER_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SHIELD = init();
|
public static final ItemType SHIELD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SHROOMLIGHT = init();
|
public static final ItemType SHROOMLIGHT = init();
|
||||||
@ -1910,6 +2072,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SIGN = init();
|
public static final ItemType SIGN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SILVERFISH_SPAWN_EGG = init();
|
public static final ItemType SILVERFISH_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SKELETON_HORSE_SPAWN_EGG = init();
|
public static final ItemType SKELETON_HORSE_SPAWN_EGG = init();
|
||||||
@ -1920,6 +2084,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SKULL_BANNER_PATTERN = init();
|
public static final ItemType SKULL_BANNER_PATTERN = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SKULL_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SLIME_BALL = init();
|
public static final ItemType SLIME_BALL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SLIME_BLOCK = init();
|
public static final ItemType SLIME_BLOCK = init();
|
||||||
@ -1958,10 +2124,20 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SMOOTH_STONE_SLAB = init();
|
public static final ItemType SMOOTH_STONE_SLAB = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SNIFFER_EGG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SNIFFER_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SNORT_POTTERY_SHERD = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SNOW = init();
|
public static final ItemType SNOW = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SNOW_BLOCK = init();
|
public static final ItemType SNOW_BLOCK = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SNOW_GOLEM_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SNOWBALL = init();
|
public static final ItemType SNOWBALL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SOUL_CAMPFIRE = init();
|
public static final ItemType SOUL_CAMPFIRE = init();
|
||||||
@ -1982,6 +2158,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SPIDER_SPAWN_EGG = init();
|
public static final ItemType SPIDER_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SPLASH_POTION = init();
|
public static final ItemType SPLASH_POTION = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SPONGE = init();
|
public static final ItemType SPONGE = init();
|
||||||
@ -2000,6 +2178,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SPRUCE_FENCE_GATE = init();
|
public static final ItemType SPRUCE_FENCE_GATE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SPRUCE_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SPRUCE_LEAVES = init();
|
public static final ItemType SPRUCE_LEAVES = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SPRUCE_LOG = init();
|
public static final ItemType SPRUCE_LOG = init();
|
||||||
@ -2068,10 +2248,16 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType STRIPPED_ACACIA_WOOD = init();
|
public static final ItemType STRIPPED_ACACIA_WOOD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType STRIPPED_BAMBOO_BLOCK = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType STRIPPED_BIRCH_LOG = init();
|
public static final ItemType STRIPPED_BIRCH_LOG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType STRIPPED_BIRCH_WOOD = init();
|
public static final ItemType STRIPPED_BIRCH_WOOD = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType STRIPPED_CHERRY_LOG = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType STRIPPED_CHERRY_WOOD = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType STRIPPED_CRIMSON_HYPHAE = init();
|
public static final ItemType STRIPPED_CRIMSON_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType STRIPPED_CRIMSON_STEM = init();
|
public static final ItemType STRIPPED_CRIMSON_STEM = init();
|
||||||
@ -2110,6 +2296,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SUNFLOWER = init();
|
public static final ItemType SUNFLOWER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType SUSPICIOUS_GRAVEL = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType SUSPICIOUS_SAND = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType SUSPICIOUS_STEW = init();
|
public static final ItemType SUSPICIOUS_STEW = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType SWEET_BERRIES = init();
|
public static final ItemType SWEET_BERRIES = init();
|
||||||
@ -2124,6 +2314,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType TERRACOTTA = init();
|
public static final ItemType TERRACOTTA = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType TINTED_GLASS = init();
|
public static final ItemType TINTED_GLASS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType TIPPED_ARROW = init();
|
public static final ItemType TIPPED_ARROW = init();
|
||||||
@ -2134,6 +2326,10 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType TORCH = init();
|
public static final ItemType TORCH = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType TORCHFLOWER = init();
|
||||||
|
@Nullable
|
||||||
|
public static final ItemType TORCHFLOWER_SEEDS = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType TOTEM_OF_UNDYING = init();
|
public static final ItemType TOTEM_OF_UNDYING = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType TRADER_LLAMA_SPAWN_EGG = init();
|
public static final ItemType TRADER_LLAMA_SPAWN_EGG = init();
|
||||||
@ -2168,6 +2364,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType VERDANT_FROGLIGHT = init();
|
public static final ItemType VERDANT_FROGLIGHT = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType VEX_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType VEX_SPAWN_EGG = init();
|
public static final ItemType VEX_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType VILLAGER_SPAWN_EGG = init();
|
public static final ItemType VILLAGER_SPAWN_EGG = init();
|
||||||
@ -2178,6 +2376,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WANDERING_TRADER_SPAWN_EGG = init();
|
public static final ItemType WANDERING_TRADER_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType WARD_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType WARDEN_SPAWN_EGG = init();
|
public static final ItemType WARDEN_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WARPED_BUTTON = init();
|
public static final ItemType WARPED_BUTTON = init();
|
||||||
@ -2192,6 +2392,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WARPED_FUNGUS_ON_A_STICK = init();
|
public static final ItemType WARPED_FUNGUS_ON_A_STICK = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType WARPED_HANGING_SIGN = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType WARPED_HYPHAE = init();
|
public static final ItemType WARPED_HYPHAE = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WARPED_NYLIUM = init();
|
public static final ItemType WARPED_NYLIUM = init();
|
||||||
@ -2248,6 +2450,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WAXED_WEATHERED_CUT_COPPER_STAIRS = init();
|
public static final ItemType WAXED_WEATHERED_CUT_COPPER_STAIRS = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType WEATHERED_COPPER = init();
|
public static final ItemType WEATHERED_COPPER = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WEATHERED_CUT_COPPER = init();
|
public static final ItemType WEATHERED_CUT_COPPER = init();
|
||||||
@ -2292,6 +2496,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WHITE_WOOL = init();
|
public static final ItemType WHITE_WOOL = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType WILD_ARMOR_TRIM_SMITHING_TEMPLATE = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType WITCH_SPAWN_EGG = init();
|
public static final ItemType WITCH_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WITHER_ROSE = init();
|
public static final ItemType WITHER_ROSE = init();
|
||||||
@ -2300,6 +2506,8 @@ public final class ItemTypes {
|
|||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WITHER_SKELETON_SPAWN_EGG = init();
|
public static final ItemType WITHER_SKELETON_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
|
public static final ItemType WITHER_SPAWN_EGG = init();
|
||||||
|
@Nullable
|
||||||
public static final ItemType WOLF_SPAWN_EGG = init();
|
public static final ItemType WOLF_SPAWN_EGG = init();
|
||||||
@Nullable
|
@Nullable
|
||||||
public static final ItemType WOODEN_AXE = init();
|
public static final ItemType WOODEN_AXE = init();
|
||||||
|
@ -47,6 +47,7 @@ public class BundledRegistries implements Registries {
|
|||||||
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_17), "117");
|
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_17), "117");
|
||||||
// 1.18 did have one item change, but we didn't get it. It's fine.
|
// 1.18 did have one item change, but we didn't get it. It's fine.
|
||||||
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_19), "119");
|
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_19), "119");
|
||||||
|
versionMap.put(Range.atLeast(Constants.DATA_VERSION_MC_1_20), "120");
|
||||||
VERSION_MAP = ImmutableRangeMap.copyOf(versionMap);
|
VERSION_MAP = ImmutableRangeMap.copyOf(versionMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist
Dateidiff unterdrückt, weil mindestens eine Zeile zu lang ist
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren