From 857b3b6560d719ca9511e8c1cdf6c55e0bfa88e5 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Thu, 2 Apr 2026 12:35:40 -0500 Subject: [PATCH] nuke com.mojang.nbt.h --- targets/minecraft/world/item/ItemInstance.h | 2 +- .../minecraft/world/level/chunk/storage/McRegionChunkStorage.h | 2 +- targets/minecraft/world/level/chunk/storage/NbtSlotFile.h | 2 +- targets/minecraft/world/level/chunk/storage/OldChunkStorage.h | 2 +- targets/minecraft/world/level/storage/MemoryLevelStorage.cpp | 2 +- targets/minecraft/world/level/storage/MemoryLevelStorage.h | 2 +- targets/minecraft/world/level/tile/entity/DispenserTileEntity.h | 2 +- targets/nbt/include/nbt/com.mojang.nbt.h | 2 -- 8 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 targets/nbt/include/nbt/com.mojang.nbt.h diff --git a/targets/minecraft/world/item/ItemInstance.h b/targets/minecraft/world/item/ItemInstance.h index feb32d34a..0a5d5a3cf 100644 --- a/targets/minecraft/world/item/ItemInstance.h +++ b/targets/minecraft/world/item/ItemInstance.h @@ -6,7 +6,7 @@ #include "UseAnim.h" #include "minecraft/world/entity/ai/attributes/Attribute.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class Entity; class Level; diff --git a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h index 403ddb8bf..60c13c4e1 100644 --- a/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/McRegionChunkStorage.h @@ -13,7 +13,7 @@ #include "OldChunkStorage.h" #include "RegionFileCache.h" #include "minecraft/world/level/chunk/LevelChunk.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class ConsoleSaveFile; class C4JThread; diff --git a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h index 700b96c42..c366fb9de 100644 --- a/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h +++ b/targets/minecraft/world/level/chunk/storage/NbtSlotFile.h @@ -3,7 +3,7 @@ #include "ZonedChunkStorage.h" #include "nbt/CompoundTag.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class NbtSlotFile { private: diff --git a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h index 1bdf7ec9d..266f3fab0 100644 --- a/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h +++ b/targets/minecraft/world/level/chunk/storage/OldChunkStorage.h @@ -6,7 +6,7 @@ #include "java/File.h" #include "minecraft/world/level/chunk/LevelChunk.h" #include "nbt/CompoundTag.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class Level; class CompoundTag; diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp index ddf855160..52b002e15 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp +++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.cpp @@ -5,7 +5,7 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" MemoryLevelStorage::MemoryLevelStorage() {} diff --git a/targets/minecraft/world/level/storage/MemoryLevelStorage.h b/targets/minecraft/world/level/storage/MemoryLevelStorage.h index c21eb097e..ea078a6b6 100644 --- a/targets/minecraft/world/level/storage/MemoryLevelStorage.h +++ b/targets/minecraft/world/level/storage/MemoryLevelStorage.h @@ -7,7 +7,7 @@ #include "minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class MemoryLevelStorage : public LevelStorage, public PlayerIO { public: diff --git a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h index f704123d3..6765b6653 100644 --- a/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h +++ b/targets/minecraft/world/level/tile/entity/DispenserTileEntity.h @@ -7,7 +7,7 @@ #include "TileEntity.h" #include "java/Class.h" #include "minecraft/world/Container.h" -#include "nbt/com.mojang.nbt.h" +#include "nbt/NbtIo.h" class Player; class Random; diff --git a/targets/nbt/include/nbt/com.mojang.nbt.h b/targets/nbt/include/nbt/com.mojang.nbt.h deleted file mode 100644 index 7edae5e04..000000000 --- a/targets/nbt/include/nbt/com.mojang.nbt.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "NbtIo.h" \ No newline at end of file