From d128801a35237b7a557ce498d181bc3e7220c227 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 31 Mar 2026 18:07:25 -0500 Subject: [PATCH] nuke ArrayWithLength --- .../LevelGeneration/ConsoleSchematicFile.h | 1 - .../UI/All Platforms/ArchiveFile.h | 1 - .../net/minecraft/client/model/Polygon.h | 1 - .../net/minecraft/client/model/geom/Cube.h | 1 - .../minecraft/client/model/geom/ModelPart.h | 1 - .../net/minecraft/client/renderer/Chunk.h | 1 - .../net/minecraft/client/renderer/Textures.h | 1 - .../net/minecraft/server/MinecraftServer.h | 2 +- .../net/minecraft/server/PlayerList.cpp | 1 - .../net/minecraft/server/PlayerList.h | 1 - .../minecraft/server/level/EntityTracker.h | 3 ++ .../ConsoleHelpers/ArrayWithLength.h | 29 ------------------- .../levelgen/structure/BlockGenMethods.h | 1 - .../level/levelgen/structure/BoundingBox.h | 1 - .../levelgen/structure/StructureFeatureIO.h | 1 + .../level/levelgen/structure/StructurePiece.h | 1 + .../world/level/newbiome/layer/Layer.h | 1 - 17 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 minecraft/Minecraft.World/ConsoleHelpers/ArrayWithLength.h diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h index c82006efa..76492eed9 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h @@ -11,7 +11,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h" #include "Minecraft.World/Header Files/compression.h" #include "Minecraft.World/net/minecraft/world/phys/Vec3.h" diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h index 1bbd625d3..f69d04058 100644 --- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h +++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h @@ -7,7 +7,6 @@ #include #include "java/File.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class DataInputStream; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h index 0d13bf529..1c4c16209 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/Polygon.h @@ -5,7 +5,6 @@ #include "Vertex.h" #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class Tesselator; diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h index 23e7cb17d..48cd9f9a5 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/Cube.h @@ -3,7 +3,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "Minecraft.Client/net/minecraft/client/model/Vertex.h" #include "Minecraft.Client/net/minecraft/client/model/Polygon.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h index b086141f7..a0a72e698 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h @@ -2,7 +2,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "Minecraft.Client/net/minecraft/client/model/Vertex.h" #include "Minecraft.Client/net/minecraft/client/model/Polygon.h" #include "Model.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h index b978c7a8d..88cd8bba4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.h @@ -6,7 +6,6 @@ #include "Minecraft.Client/net/minecraft/client/renderer/culling/AllowAllCuller.h" #include "Tesselator.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "LevelRenderer.h" #include "Minecraft.World/net/minecraft/world/phys/AABB.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h index aa46ee12b..ebb80f6c4 100644 --- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h +++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.h @@ -5,7 +5,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "4J.Render/4J_Render.h" class Icon; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h index 8ab096f79..f55f7dd94 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h @@ -3,7 +3,6 @@ #include #include "ConsoleInputSource.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "Minecraft.World/net/minecraft/SharedConstants.h" #include "Minecraft.World/ConsoleHelpers/C4JThread.h" #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h" @@ -22,6 +21,7 @@ class LevelType; class ProgressRenderer; class CommandDispatcher; class LevelGenerationOptions; +class ServerLevel; #define MINECRAFT_SERVER_SLOW_QUEUE_DELAY 250 diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp index f6e6e1f88..26a3a3f23 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp @@ -14,7 +14,6 @@ #include "Minecraft.Client/net/minecraft/server/level/EntityTracker.h" #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h" #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h" -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h" #include "Minecraft.World/net/minecraft/network/net.minecraft.network.h" #include "Minecraft.World/net/minecraft/Pos.h" diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h index 325b28b02..83ff30167 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.h @@ -2,7 +2,6 @@ #include #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class ServerPlayer; class PlayerChunkMap; diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h index 0e19fc1e7..268bb475c 100644 --- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h +++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h @@ -1,7 +1,10 @@ #pragma once + #include "Minecraft.World/ConsoleHelpers/HashExtension.h" #include "java/JavaIntHash.h" + class Entity; +class ServerLevel; class ServerPlayer; class TrackedEntity; class MinecraftServer; diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ArrayWithLength.h b/minecraft/Minecraft.World/ConsoleHelpers/ArrayWithLength.h deleted file mode 100644 index 0e0d36ac2..000000000 --- a/minecraft/Minecraft.World/ConsoleHelpers/ArrayWithLength.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -class Biome; -class LevelChunk; -class Node; -class Item; -class Tile; -class Stat; -class MobCategory; -class File; -class Vertex; -class _Polygon; // Renaming as have conflict with Windows Polygon fn -class ServerLevel; -class MultiPlayerLevel; -class Level; -class LevelRenderer; -class WeighedRandomItem; -class WeighedTreasure; -class Layer; -// class Cube; -class ModelPart; -class Enchantment; -class ClipChunk; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h index 9ff56429e..1e91bc847 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BlockGenMethods.h @@ -2,7 +2,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class Level; diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h index 8d3acc4ad..d81998bad 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h @@ -1,6 +1,5 @@ #pragma once -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" #include "nbt/IntArrayTag.h" class BoundingBox { diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h index 30726fca4..87de9a762 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureIO.h @@ -6,6 +6,7 @@ class StructurePiece; class StructureStart; +class Level; typedef StructurePiece* (*structurePieceCreateFn)(); typedef StructureStart* (*structureStartCreateFn)(); diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h index c0e7f5dd4..e04f613b9 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructurePiece.h @@ -12,6 +12,7 @@ class Random; class ChunkPos; class BlockSelector; class ChestTileEntity; +class WeighedTreasure; class TilePos; /** diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h index 23ef0d4fb..f7dc364d6 100644 --- a/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h +++ b/minecraft/Minecraft.World/net/minecraft/world/level/newbiome/layer/Layer.h @@ -5,7 +5,6 @@ #include #include -#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h" class LevelType;