Update to 1.17

Update to Official classnames
Patchwork
Make the game compile and run
Merge in the new HUD overlay API
Merge in the new render properties API
PEEL
Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason.
New FML installer
Update to 1.17.1

Co-authored-by: LexManos <[email protected]>
Co-authored-by: SizableShrimp <[email protected]>
Co-authored-by: cpw <[email protected]>
Co-authored-by: Curle <[email protected]>
Co-authored-by: Unnoen <[email protected]>
Co-authored-by: covers1624 <[email protected]>
Co-authored-by: DaemonUmbra <[email protected]>
Co-authored-by: gigaherz <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
authored and Curle committed 2021-07-22 19:57:02 +01:00
1 parent 064ae6961b
commit be5446b91c
1990 files changed
+35661 -37544

No files matched your search

@@ -22,15 +22,15 @@ package net.minecraftforge.common.util;
import java.lang.ref.WeakReference;
import java.util.Objects;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.RegistryKey;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.fml.server.ServerLifecycleHooks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.resources.ResourceKey;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.Level;
import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
import javax.annotation.Nullable;
@@ -45,18 +45,18 @@ public class BlockSnapshot
{
private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("forge.debugBlockSnapshot", "false"));
private final RegistryKey<World> dim;
private final ResourceKey<Level> dim;
private final BlockPos pos;
private final int flags;
private final BlockState block;
@Nullable
private final CompoundNBT nbt;
private final CompoundTag nbt;
@Nullable
private WeakReference<IWorld> world;
private WeakReference<LevelAccessor> world;
private String toString = null;
private BlockSnapshot(RegistryKey<World> dim, IWorld world, BlockPos pos, BlockState state, @Nullable CompoundNBT nbt, int flags)
private BlockSnapshot(ResourceKey<Level> dim, LevelAccessor world, BlockPos pos, BlockState state, @Nullable CompoundTag nbt, int flags)
{
this.dim = dim;
this.pos = pos.immutable();
@@ -70,36 +70,36 @@ public class BlockSnapshot
System.out.println("Created " + this.toString());
}
public static BlockSnapshot create(RegistryKey<World> dim, IWorld world, BlockPos pos)
public static BlockSnapshot create(ResourceKey<Level> dim, LevelAccessor world, BlockPos pos)
{
return create(dim, world, pos, 3);
}
public static BlockSnapshot create(RegistryKey<World> dim, IWorld world, BlockPos pos, int flag)
public static BlockSnapshot create(ResourceKey<Level> dim, LevelAccessor world, BlockPos pos, int flag)
{
return new BlockSnapshot(dim, world, pos, world.getBlockState(pos), getTileNBT(world.getBlockEntity(pos)), flag);
}
@Nullable
private static CompoundNBT getTileNBT(@Nullable TileEntity te)
private static CompoundTag getTileNBT(@Nullable BlockEntity te)
{
return te == null ? null : te.save(new CompoundNBT());
return te == null ? null : te.save(new CompoundTag());
}
public BlockState getCurrentBlock()
{
IWorld world = getWorld();
LevelAccessor world = getWorld();
return world == null ? Blocks.AIR.defaultBlockState() : world.getBlockState(this.pos);
}
@Nullable
public IWorld getWorld()
public LevelAccessor getWorld()
{
IWorld world = this.world != null ? this.world.get() : null;
LevelAccessor world = this.world != null ? this.world.get() : null;
if (world == null)
{
world = ServerLifecycleHooks.getCurrentServer().getLevel(this.dim);
this.world = new WeakReference<IWorld>(world);
this.world = new WeakReference<LevelAccessor>(world);
}
return world;
}
@@ -110,9 +110,9 @@ public class BlockSnapshot
}
@Nullable
public TileEntity getTileEntity()
public BlockEntity getBlockEntity()
{
return getNbt() != null ? TileEntity.loadStatic(getReplacedBlock(), getNbt()) : null;
return getNbt() != null ? BlockEntity.loadStatic(getPos(), getReplacedBlock(), getNbt()) : null;
}
public boolean restore()
@@ -130,7 +130,7 @@ public class BlockSnapshot
return restoreToLocation(getWorld(), getPos(), force, notifyNeighbors);
}
public boolean restoreToLocation(IWorld world, BlockPos pos, boolean force, boolean notifyNeighbors)
public boolean restoreToLocation(LevelAccessor world, BlockPos pos, boolean force, boolean notifyNeighbors)
{
BlockState current = getCurrentBlock();
BlockState replaced = getReplacedBlock();
@@ -146,16 +146,16 @@ public class BlockSnapshot
}
world.setBlock(pos, replaced, flags);
if (world instanceof World)
((World)world).sendBlockUpdated(pos, current, replaced, flags);
if (world instanceof Level)
((Level)world).sendBlockUpdated(pos, current, replaced, flags);
TileEntity te = null;
BlockEntity te = null;
if (getNbt() != null)
{
te = world.getBlockEntity(pos);
if (te != null)
{
te.load(getReplacedBlock(), getNbt());
te.load(getNbt());
te.setChanged();
}
}
@@ -216,6 +216,6 @@ public class BlockSnapshot
public int getFlag() { return flags; }
@Nullable
public CompoundNBT getNbt() { return nbt; }
public CompoundTag getNbt() { return nbt; }
}
@@ -19,8 +19,8 @@
package net.minecraftforge.common.util;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.ChunkPos;
// Sorter to load nearby chunks first
public class ChunkCoordComparator implements java.util.Comparator<ChunkPos>
@@ -28,7 +28,7 @@ public class ChunkCoordComparator implements java.util.Comparator<ChunkPos>
private int x;
private int z;
public ChunkCoordComparator(ServerPlayerEntity entityplayer)
public ChunkCoordComparator(ServerPlayer entityplayer)
{
x = (int) entityplayer.getX() >> 4;
z = (int) entityplayer.getZ() >> 4;
@@ -19,15 +19,6 @@
package net.minecraftforge.common.util;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.particles.ParticleTypes;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
/**
* A class containing constants for magic numbers used in the minecraft codebase.
* Everything here should be checked each update, and have a comment relating to where to check it.
@@ -19,22 +19,17 @@
package net.minecraftforge.common.util;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.world.storage.WorldSavedData;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.saveddata.SavedData;
public class DummyWorldSaveData extends WorldSavedData {
public static final DummyWorldSaveData DUMMY = new DummyWorldSaveData();
private DummyWorldSaveData() {
super("DUMMYDUMMY \uD83D\uDC4C\uD83D\uDC4C\uD83D\uDC4C");
public class DummySavedData extends SavedData {
public static final DummySavedData DUMMY = new DummySavedData();
private DummySavedData() {
super();
}
@Override
public void load(final CompoundNBT nbt) {
// NOOP
}
@Override
public CompoundNBT save(final CompoundNBT compound) {
public CompoundTag save(final CompoundTag compound) {
// NOOP
return null;
}
@@ -19,117 +19,155 @@
package net.minecraftforge.common.util;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import com.mojang.authlib.GameProfile;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.network.IPacket;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.PacketDirection;
import net.minecraft.network.play.ServerPlayNetHandler;
import net.minecraft.network.play.client.*;
import net.minecraft.network.play.server.SPlayerPositionLookPacket;
import net.minecraft.core.BlockPos;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
import net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
import net.minecraft.network.protocol.game.ServerboundBlockEntityTagQuery;
import net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
import net.minecraft.network.protocol.game.ServerboundChatPacket;
import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
import net.minecraft.network.protocol.game.ServerboundClientInformationPacket;
import net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
import net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket;
import net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
import net.minecraft.network.protocol.game.ServerboundEditBookPacket;
import net.minecraft.network.protocol.game.ServerboundEntityTagQuery;
import net.minecraft.network.protocol.game.ServerboundInteractPacket;
import net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
import net.minecraft.network.protocol.game.ServerboundKeepAlivePacket;
import net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
import net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket;
import net.minecraft.network.protocol.game.ServerboundPickItemPacket;
import net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
import net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
import net.minecraft.network.protocol.game.ServerboundRecipeBookChangeSettingsPacket;
import net.minecraft.network.protocol.game.ServerboundRecipeBookSeenRecipePacket;
import net.minecraft.network.protocol.game.ServerboundRenameItemPacket;
import net.minecraft.network.protocol.game.ServerboundResourcePackPacket;
import net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket;
import net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
import net.minecraft.network.protocol.game.ServerboundSetBeaconPacket;
import net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket;
import net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket;
import net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket;
import net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket;
import net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket;
import net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket;
import net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
import net.minecraft.network.protocol.game.ServerboundSwingPacket;
import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
import net.minecraft.network.protocol.game.ServerboundUseItemPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.management.PlayerInteractionManager;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.stats.Stat;
import net.minecraft.util.DamageSource;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fml.server.ServerLifecycleHooks;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.Set;
import java.util.UUID;
//Preliminary, simple Fake Player class
public class FakePlayer extends ServerPlayerEntity
public class FakePlayer extends ServerPlayer
{
public FakePlayer(ServerWorld world, GameProfile name)
public FakePlayer(ServerLevel world, GameProfile name)
{
super(world.getServer(), world, name, new PlayerInteractionManager(world));
super(world.getServer(), world, name);
this.connection = new FakePlayerNetHandler(world.getServer(), this);
}
@Override public Vector3d position(){ return new Vector3d(0, 0, 0); }
@Override public Vec3 position(){ return new Vec3(0, 0, 0); }
@Override public BlockPos blockPosition(){ return BlockPos.ZERO; }
@Override public void displayClientMessage(ITextComponent chatComponent, boolean actionBar){}
@Override public void sendMessage(ITextComponent component, UUID senderUUID) {}
@Override public void displayClientMessage(Component chatComponent, boolean actionBar){}
@Override public void sendMessage(Component component, UUID senderUUID) {}
@Override public void awardStat(Stat par1StatBase, int par2){}
//@Override public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){}
@Override public boolean isInvulnerableTo(DamageSource source){ return true; }
@Override public boolean canHarmPlayer(PlayerEntity player){ return false; }
@Override public boolean canHarmPlayer(Player player){ return false; }
@Override public void die(DamageSource source){ return; }
@Override public void tick(){ return; }
@Override public void updateOptions(CClientSettingsPacket pkt){ return; }
@Override public void updateOptions(ServerboundClientInformationPacket pkt){ return; }
@Override @Nullable public MinecraftServer getServer() { return ServerLifecycleHooks.getCurrentServer(); }
@ParametersAreNonnullByDefault
private static class FakePlayerNetHandler extends ServerPlayNetHandler {
private static final NetworkManager DUMMY_NETWORK_MANAGER = new NetworkManager(PacketDirection.CLIENTBOUND);
private static class FakePlayerNetHandler extends ServerGamePacketListenerImpl {
private static final Connection DUMMY_CONNECTION = new Connection(PacketFlow.CLIENTBOUND);
public FakePlayerNetHandler(MinecraftServer server, ServerPlayerEntity player) {
super(server, DUMMY_NETWORK_MANAGER, player);
public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player) {
super(server, DUMMY_CONNECTION, player);
}
@Override public void tick() { }
@Override public void resetPosition() { }
@Override public void disconnect(ITextComponent message) { }
@Override public void handlePlayerInput(CInputPacket packet) { }
@Override public void handleMoveVehicle(CMoveVehiclePacket packet) { }
@Override public void handleAcceptTeleportPacket(CConfirmTeleportPacket packet) { }
@Override public void handleRecipeBookSeenRecipePacket(CMarkRecipeSeenPacket packet) { }
@Override public void handleRecipeBookChangeSettingsPacket(CUpdateRecipeBookStatusPacket packet) { }
@Override public void handleSeenAdvancements(CSeenAdvancementsPacket packet) { }
@Override public void handleCustomCommandSuggestions(CTabCompletePacket packet) { }
@Override public void handleSetCommandBlock(CUpdateCommandBlockPacket packet) { }
@Override public void handleSetCommandMinecart(CUpdateMinecartCommandBlockPacket packet) { }
@Override public void handlePickItem(CPickItemPacket packet) { }
@Override public void handleRenameItem(CRenameItemPacket packet) { }
@Override public void handleSetBeaconPacket(CUpdateBeaconPacket packet) { }
@Override public void handleSetStructureBlock(CUpdateStructureBlockPacket packet) { }
@Override public void handleSetJigsawBlock(CUpdateJigsawBlockPacket packet) { }
@Override public void handleJigsawGenerate(CJigsawBlockGeneratePacket packet) { }
@Override public void handleSelectTrade(CSelectTradePacket packet) { }
@Override public void handleEditBook(CEditBookPacket packet) { }
@Override public void handleEntityTagQuery(CQueryEntityNBTPacket packet) { }
@Override public void handleBlockEntityTagQuery(CQueryTileEntityNBTPacket packet) { }
@Override public void handleMovePlayer(CPlayerPacket packet) { }
@Override public void disconnect(Component message) { }
@Override public void handlePlayerInput(ServerboundPlayerInputPacket packet) { }
@Override public void handleMoveVehicle(ServerboundMoveVehiclePacket packet) { }
@Override public void handleAcceptTeleportPacket(ServerboundAcceptTeleportationPacket packet) { }
@Override public void handleRecipeBookSeenRecipePacket(ServerboundRecipeBookSeenRecipePacket packet) { }
@Override public void handleRecipeBookChangeSettingsPacket(ServerboundRecipeBookChangeSettingsPacket packet) { }
@Override public void handleSeenAdvancements(ServerboundSeenAdvancementsPacket packet) { }
@Override public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) { }
@Override public void handleSetCommandBlock(ServerboundSetCommandBlockPacket packet) { }
@Override public void handleSetCommandMinecart(ServerboundSetCommandMinecartPacket packet) { }
@Override public void handlePickItem(ServerboundPickItemPacket packet) { }
@Override public void handleRenameItem(ServerboundRenameItemPacket packet) { }
@Override public void handleSetBeaconPacket(ServerboundSetBeaconPacket packet) { }
@Override public void handleSetStructureBlock(ServerboundSetStructureBlockPacket packet) { }
@Override public void handleSetJigsawBlock(ServerboundSetJigsawBlockPacket packet) { }
@Override public void handleJigsawGenerate(ServerboundJigsawGeneratePacket packet) { }
@Override public void handleSelectTrade(ServerboundSelectTradePacket packet) { }
@Override public void handleEditBook(ServerboundEditBookPacket packet) { }
@Override public void handleEntityTagQuery(ServerboundEntityTagQuery packet) { }
@Override public void handleBlockEntityTagQuery(ServerboundBlockEntityTagQuery packet) { }
@Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { }
@Override public void teleport(double x, double y, double z, float yaw, float pitch) { }
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<SPlayerPositionLookPacket.Flags> flags) { }
@Override public void handlePlayerAction(CPlayerDiggingPacket packet) { }
@Override public void handleUseItemOn(CPlayerTryUseItemOnBlockPacket packet) { }
@Override public void handleUseItem(CPlayerTryUseItemPacket packet) { }
@Override public void handleTeleportToEntityPacket(CSpectatePacket packet) { }
@Override public void handleResourcePackResponse(CResourcePackStatusPacket packet) { }
@Override public void handlePaddleBoat(CSteerBoatPacket packet) { }
@Override public void onDisconnect(ITextComponent message) { }
@Override public void send(IPacket<?> packet) { }
@Override public void send(IPacket<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> p_211148_2_) { }
@Override public void handleSetCarriedItem(CHeldItemChangePacket packet) { }
@Override public void handleChat(CChatMessagePacket packet) { }
@Override public void handleAnimate(CAnimateHandPacket packet) { }
@Override public void handlePlayerCommand(CEntityActionPacket packet) { }
@Override public void handleInteract(CUseEntityPacket packet) { }
@Override public void handleClientCommand(CClientStatusPacket packet) { }
@Override public void handleContainerClose(CCloseWindowPacket packet) { }
@Override public void handleContainerClick(CClickWindowPacket packet) { }
@Override public void handlePlaceRecipe(CPlaceRecipePacket packet) { }
@Override public void handleContainerButtonClick(CEnchantItemPacket packet) { }
@Override public void handleSetCreativeModeSlot(CCreativeInventoryActionPacket packet) { }
@Override public void handleContainerAck(CConfirmTransactionPacket packet) { }
@Override public void handleSignUpdate(CUpdateSignPacket packet) { }
@Override public void handleKeepAlive(CKeepAlivePacket packet) { }
@Override public void handlePlayerAbilities(CPlayerAbilitiesPacket packet) { }
@Override public void handleClientInformation(CClientSettingsPacket packet) { }
@Override public void handleCustomPayload(CCustomPayloadPacket packet) { }
@Override public void handleChangeDifficulty(CSetDifficultyPacket packet) { }
@Override public void handleLockDifficulty(CLockDifficultyPacket packet) { }
@Override public void teleport(double x, double y, double z, float yaw, float pitch, Set<ClientboundPlayerPositionPacket.RelativeArgument> flags) { }
@Override public void handlePlayerAction(ServerboundPlayerActionPacket packet) { }
@Override public void handleUseItemOn(ServerboundUseItemOnPacket packet) { }
@Override public void handleUseItem(ServerboundUseItemPacket packet) { }
@Override public void handleTeleportToEntityPacket(ServerboundTeleportToEntityPacket packet) { }
@Override public void handleResourcePackResponse(ServerboundResourcePackPacket packet) { }
@Override public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) { }
@Override public void onDisconnect(Component message) { }
@Override public void send(Packet<?> packet) { }
@Override public void send(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) { }
@Override public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) { }
@Override public void handleChat(ServerboundChatPacket packet) { }
@Override public void handleAnimate(ServerboundSwingPacket packet) { }
@Override public void handlePlayerCommand(ServerboundPlayerCommandPacket packet) { }
@Override public void handleInteract(ServerboundInteractPacket packet) { }
@Override public void handleClientCommand(ServerboundClientCommandPacket packet) { }
@Override public void handleContainerClose(ServerboundContainerClosePacket packet) { }
@Override public void handleContainerClick(ServerboundContainerClickPacket packet) { }
@Override public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { }
@Override public void handleContainerButtonClick(ServerboundContainerButtonClickPacket packet) { }
@Override public void handleSetCreativeModeSlot(ServerboundSetCreativeModeSlotPacket packet) { }
@Override public void handleSignUpdate(ServerboundSignUpdatePacket packet) { }
@Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { }
@Override public void handlePlayerAbilities(ServerboundPlayerAbilitiesPacket packet) { }
@Override public void handleClientInformation(ServerboundClientInformationPacket packet) { }
@Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { }
@Override public void handleChangeDifficulty(ServerboundChangeDifficultyPacket packet) { }
@Override public void handleLockDifficulty(ServerboundLockDifficultyPacket packet) { }
}
}
@@ -20,15 +20,13 @@
package net.minecraftforge.common.util;
import java.lang.ref.WeakReference;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import com.google.common.collect.Maps;
import com.mojang.authlib.GameProfile;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.server.level.ServerLevel;
//To be expanded for generic Mod fake players?
public class FakePlayerFactory
@@ -38,7 +36,7 @@ public class FakePlayerFactory
private static Map<GameProfile, FakePlayer> fakePlayers = Maps.newHashMap();
private static WeakReference<FakePlayer> MINECRAFT_PLAYER = null;
public static FakePlayer getMinecraft(ServerWorld world)
public static FakePlayer getMinecraft(ServerLevel world)
{
FakePlayer ret = MINECRAFT_PLAYER != null ? MINECRAFT_PLAYER.get() : null;
if (ret == null)
@@ -54,7 +52,7 @@ public class FakePlayerFactory
* Mods should either hold weak references to the return value, or listen for a
* WorldEvent.Unload and kill all references to prevent worlds staying in memory.
*/
public static FakePlayer get(ServerWorld world, GameProfile username)
public static FakePlayer get(ServerLevel world, GameProfile username)
{
if (!fakePlayers.containsKey(username))
{
@@ -65,7 +63,7 @@ public class FakePlayerFactory
return fakePlayers.get(username);
}
public static void unloadWorld(ServerWorld world)
public static void unloadWorld(ServerLevel world)
{
fakePlayers.entrySet().removeIf(entry -> entry.getValue().level == world);
if (MINECRAFT_PLAYER != null && MINECRAFT_PLAYER.get() != null && MINECRAFT_PLAYER.get().level == world) // This shouldn't be strictly necessary, but lets be aggressive.
@@ -19,11 +19,8 @@
package net.minecraftforge.common.util;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.util.SoundEvent;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.sounds.SoundEvent;
import javax.annotation.Nonnull;
import java.util.function.Supplier;
@@ -19,13 +19,13 @@
package net.minecraftforge.common.util;
import net.minecraft.nbt.INBT;
import net.minecraft.nbt.Tag;
/**
* An interface designed to unify various things in the Minecraft
* code base that can be serialized to and from a NBT tag.
*/
public interface INBTSerializable<T extends INBT>
public interface INBTSerializable<T extends Tag>
{
T serializeNBT();
void deserializeNBT(T nbt);
@@ -23,13 +23,12 @@ import java.util.function.Function;
import javax.annotation.Nullable;
import net.minecraft.block.PortalInfo;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.Teleporter;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.level.portal.PortalInfo;
import net.minecraft.world.entity.Entity;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.level.portal.PortalForcer;
import net.minecraft.server.level.ServerLevel;
/**
* Interface for handling the placement of entities during dimension change.
@@ -60,7 +59,7 @@ public interface ITeleporter
*
* @return the entity in the new World. Vanilla creates for most {@link Entity}s a new instance and copy the data. But <b>you are not allowed</b> to create a new instance for {@link PlayerEntity}s! Move the player and update its state, see {@link ServerPlayerEntity#changeDimension(net.minecraft.world.server.ServerWorld, ITeleporter)}
*/
default Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw, Function<Boolean, Entity> repositionEntity)
default Entity placeEntity(Entity entity, ServerLevel currentWorld, ServerLevel destWorld, float yaw, Function<Boolean, Entity> repositionEntity)
{
return repositionEntity.apply(true);
}
@@ -79,9 +78,9 @@ public interface ITeleporter
* @return The location, rotation, and motion of the entity in the destWorld after the teleport
*/
@Nullable
default PortalInfo getPortalInfo(Entity entity, ServerWorld destWorld, Function<ServerWorld, PortalInfo> defaultPortalInfo)
default PortalInfo getPortalInfo(Entity entity, ServerLevel destWorld, Function<ServerLevel, PortalInfo> defaultPortalInfo)
{
return this.isVanilla() ? defaultPortalInfo.apply(destWorld) : new PortalInfo(entity.position(), Vector3d.ZERO, entity.yRot, entity.xRot);
return this.isVanilla() ? defaultPortalInfo.apply(destWorld) : new PortalInfo(entity.position(), Vec3.ZERO, entity.getYRot(), entity.getXRot());
}
/**
@@ -89,7 +88,7 @@ public interface ITeleporter
*/
default boolean isVanilla()
{
return this.getClass() == Teleporter.class;
return this.getClass() == PortalForcer.class;
}
/**
@@ -99,7 +98,7 @@ public interface ITeleporter
* @param destWorld the target world
* @return true to play the vanilla sound
*/
default boolean playTeleportSound(ServerPlayerEntity player, ServerWorld sourceWorld, ServerWorld destWorld)
default boolean playTeleportSound(ServerPlayer player, ServerLevel sourceWorld, ServerLevel destWorld)
{
return true;
}
@@ -38,8 +38,8 @@ import com.google.gson.JsonSerializer;
import com.google.gson.JsonSyntaxException;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.nbt.JsonToNBT;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.TagParser;
import net.minecraft.nbt.CompoundTag;
import javax.annotation.Nullable;
@@ -97,13 +97,13 @@ public class JsonUtils
}
@Nullable
public static CompoundNBT readNBT(JsonObject json, String key)
public static CompoundTag readNBT(JsonObject json, String key)
{
if (net.minecraft.util.JSONUtils.isValidNode(json, key))
if (net.minecraft.util.GsonHelper.isValidNode(json, key))
{
try
{
return JsonToNBT.parseTag(net.minecraft.util.JSONUtils.getAsString(json, key));
return TagParser.parseTag(net.minecraft.util.GsonHelper.getAsString(json, key));
} catch (CommandSyntaxException e)
{
throw new JsonSyntaxException("Malformed NBT tag", e);
@@ -28,15 +28,13 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraftforge.common.capabilities.Capability;
/**
* This object encapsulates a lazy value, with typical transformation operations
* (map/ifPresent) available, much like {@link Optional}.
@@ -0,0 +1,57 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2021.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.common.util;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.util.StringBuilderFormattable;
import java.util.function.Consumer;
public record LogMessageAdapter(Consumer<StringBuilder> builder) implements Message, StringBuilderFormattable {
private static final Object[] EMPTY = new Object[0];
@Override
public String getFormattedMessage() {
return "";
}
@Override
public String getFormat() {
return "";
}
@Override
public Object[] getParameters() {
return EMPTY;
}
@Override
public Throwable getThrowable() {
return null;
}
@Override
public void formatTo(final StringBuilder buffer) {
builder.accept(buffer);
}
public static Message adapt(final Consumer<StringBuilder> toConsume) {
return new LogMessageAdapter(toConsume);
}
}
@@ -19,8 +19,6 @@
package net.minecraftforge.common.util;
import java.util.function.Consumer;
import javax.annotation.Nonnull;
/**
@@ -19,8 +19,6 @@
package net.minecraftforge.common.util;
import java.util.function.Function;
import javax.annotation.Nonnull;
/**
@@ -19,8 +19,6 @@
package net.minecraftforge.common.util;
import java.util.function.Predicate;
import javax.annotation.Nonnull;
/**
@@ -19,8 +19,6 @@
package net.minecraftforge.common.util;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
/**
@@ -25,20 +25,20 @@ import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
import net.minecraft.tags.ITag;
import net.minecraft.tags.ITagCollection;
import net.minecraft.util.ResourceLocation;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagCollection;
import net.minecraft.resources.ResourceLocation;
public class ReverseTagWrapper<T>
{
private final T target;
private final Supplier<ITagCollection<T>> colSupplier;
private final Supplier<TagCollection<T>> colSupplier;
//This map is immutable we track its identity change.
private Map<ResourceLocation, ITag<T>> colCache;
private Map<ResourceLocation, Tag<T>> colCache;
private Set<ResourceLocation> cache = null;
public ReverseTagWrapper(T target, Supplier<ITagCollection<T>> colSupplier)
public ReverseTagWrapper(T target, Supplier<TagCollection<T>> colSupplier)
{
this.target = target;
this.colSupplier = colSupplier;
@@ -46,7 +46,7 @@ public class ReverseTagWrapper<T>
public Set<ResourceLocation> getTagNames()
{
ITagCollection<T> collection = colSupplier.get();
TagCollection<T> collection = colSupplier.get();
if (cache == null || colCache != collection.getAllTags()) // Identity equals.
{
this.cache = Collections.unmodifiableSet(new HashSet<>(collection.getMatchingTags(target)));
@@ -21,29 +21,29 @@ package net.minecraftforge.common.util;
import javax.annotation.Nullable;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.world.storage.WorldSavedData;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.saveddata.SavedData;
import net.minecraftforge.common.capabilities.CapabilityProvider;
public class WorldCapabilityData extends WorldSavedData
public class WorldCapabilityData extends SavedData
{
public static final String ID = "capabilities";
private INBTSerializable<CompoundNBT> serializable;
private CompoundNBT capNBT = null;
private INBTSerializable<CompoundTag> serializable;
private CompoundTag capNBT = null;
public WorldCapabilityData(String name)
public WorldCapabilityData(@Nullable INBTSerializable<CompoundTag> serializable)
{
super(name);
}
public WorldCapabilityData(@Nullable INBTSerializable<CompoundNBT> serializable)
{
super(ID);
this.serializable = serializable;
}
@Override
public void load(CompoundNBT nbt)
public static WorldCapabilityData load(CompoundTag tag, @Nullable INBTSerializable<CompoundTag> serializable) {
WorldCapabilityData data = new WorldCapabilityData(serializable);
data.read(tag);
return data;
}
public void read(CompoundTag nbt)
{
this.capNBT = nbt;
if (serializable != null)
@@ -54,7 +54,7 @@ public class WorldCapabilityData extends WorldSavedData
}
@Override
public CompoundNBT save(CompoundNBT nbt)
public CompoundTag save(CompoundTag nbt)
{
if (serializable != null)
nbt = serializable.serializeNBT();
@@ -67,7 +67,7 @@ public class WorldCapabilityData extends WorldSavedData
return true;
}
public void setCapabilities(INBTSerializable<CompoundNBT> capabilities)
public void setCapabilities(INBTSerializable<CompoundTag> capabilities)
{
this.serializable = capabilities;
if (this.capNBT != null && serializable != null)