From ce57edff9d1267b4758c6f22cf041d6579893fe2 Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Sun, 22 Mar 2026 02:28:46 -0500
Subject: [PATCH] fix strings, includes, the usual
---
.../Windows64Media/loc/en-EN/strings.lang | 296 ++++++++++++++++++
Minecraft.Client/Level/ServerLevel.cpp | 10 +-
Minecraft.Client/Network/PlayerList.cpp | 2 +-
Minecraft.Client/Player/ServerPlayer.cpp | 21 +-
.../EntityRenderers/HorseRenderer.cpp | 3 +-
.../EntityRenderers/ItemInHandRenderer.cpp | 2 +-
.../EntityRenderers/PistonPieceRenderer.cpp | 2 +-
.../TileEntityRenderDispatcher.cpp | 2 +-
Minecraft.Client/Rendering/Models/ModelPart.h | 2 +-
Minecraft.Client/meson.build | 6 +-
Minecraft.World/Network/Packets/Packet.cpp | 2 +-
11 files changed, 321 insertions(+), 27 deletions(-)
diff --git a/Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang b/Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang
index da87173f9..696907be1 100644
--- a/Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang
+++ b/Minecraft.Assets/Windows64Media/loc/en-EN/strings.lang
@@ -7255,6 +7255,302 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
Upload Failed. Please try again later.
+
+ NOT USED
+
+
+
+ You can use the touchscreen on the PlayStation®Vita system to navigate menus!
+
+
+
+ minecraftforum has a section dedicated to the PlayStation®Vita Edition.
+
+
+
+ You'll get the latest info on this game from @4JStudios and @Kappische on twitter!
+
+
+
+ Don't look an Enderman in the eye!
+
+
+
+ We think 4J Studios has removed Herobrine from the PlayStation®Vita system game, but we're not too sure.
+
+
+
+ Minecraft: PlayStation®Vita Edition broke lots of records!
+
+
+
+ {*T3*}HOW TO PLAY : MULTIPLAYER{*ETW*}{*B*}{*B*}
+Minecraft on the PlayStation®Vita system is a multiplayer game by default.{*B*}{*B*}
+When you start or join an online game, it will be visible to people in your friends list (unless you've selected Invite Only when hosting the game), and if they join the game, it will also be visible to people in their friends list (if you have selected the Allow Friends of Friends option).{*B*}
+When you are in a game, you can press the SELECT button to bring up a list of all other players in the game, and Kick players from the game.
+
+
+
+ {*T3*}HOW TO PLAY : SHARING SCREENSHOTS{*ETW*}{*B*}{*B*}
+You can capture a screenshot from your game by bringing up the Pause Menu, and pressing{*CONTROLLER_VK_Y*} to Share to Facebook. You'll be presented with a miniature version of your screenshot, and can edit the text associated with the Facebook post.{*B*}{*B*}
+There's a camera mode especially for taking these screenshots, so that you can see the front of your character in the shot - press{*CONTROLLER_ACTION_CAMERA*} until you can see the front view of your character before pressing{*CONTROLLER_VK_Y*} to Share.{*B*}{*B*}
+Online ID's will not be displayed in the screenshot.
+
+
+
+ {*T3*}HOW TO PLAY : CREATIVE MODE{*ETW*}{*B*}{*B*}
+The creative mode interface allows any item in the game to be moved into the player’s inventory without the need for mining or crafting the item.
+The items in the player's inventory will not be removed when they are placed or used in the world, and this allows the player to focus on building rather than resource gathering.{*B*}
+If you create, load or save a world in Creative Mode, that world will have trophies and leaderboard updates disabled, even if it is then loaded in Survival Mode.{*B*}
+To fly when in Creative Mode, press{*CONTROLLER_ACTION_JUMP*} twice quickly. To exit flying, repeat the action. To fly faster, push{*CONTROLLER_ACTION_MOVE*} forward twice in rapid succession while flying.
+When in flying mode, you can hold down{*CONTROLLER_ACTION_JUMP*} to move up and{*CONTROLLER_ACTION_SNEAK*} to move down, or use{*CONTROLLER_ACTION_DPAD_UP*} to move up, {*CONTROLLER_ACTION_DPAD_DOWN*} to move down,
+{*CONTROLLER_ACTION_DPAD_LEFT*} to move left, and {*CONTROLLER_ACTION_DPAD_RIGHT*} to move right.
+
+
+
+ Pressing{*CONTROLLER_ACTION_JUMP*} twice quickly will allow you to fly. To exit flying, repeat the action. To fly faster, push{*CONTROLLER_ACTION_MOVE*} forward twice in rapid succession while flying.
+When in flying mode, you can hold down{*CONTROLLER_ACTION_JUMP*} to move up and{*CONTROLLER_ACTION_SNEAK*} to move down, or use the directional buttons to move up, down, left or right.
+
+
+
+ NOT USED
+
+
+
+ NOT USED
+
+
+
+ "NOT USED"
+
+
+
+ "NOT USED"
+
+
+
+ Invite Friends
+
+
+
+ If you create, load or save a world in Creative Mode, that world will have trophies and leaderboard updates disabled, even if it is then loaded in Survival Mode. Are you sure you want to continue?
+
+
+
+ This world has previously been saved in Creative Mode, and it will have trophies and leaderboard updates disabled. Are you sure you want to continue?
+
+
+
+ This world has previously been saved in Creative Mode, and it will have trophies and leaderboard updates disabled.
+
+
+
+ If you create, load or save a world with Host Privileges enabled, that world will have trophies and leaderboard updates disabled, even if it is then loaded with those options off. Are you sure you want to continue?
+
+
+
+ Connection to "PSN" was lost. Exiting to the main menu.
+
+
+
+ Connection to "PSN" was lost.
+
+
+
+ This is the Minecraft: PlayStation®Vita Edition trial game. If you had the full game, you would just have earned a trophy!
+Unlock the full game to experience the joy of Minecraft: PlayStation®Vita Edition and to play with your friends across the globe through "PSN".
+Would you like to unlock the full game?
+
+
+
+ This is the Minecraft: PlayStation®Vita Edition trial game. If you had the full game, you would just have earned a theme!
+Unlock the full game to experience the joy of Minecraft: PlayStation®Vita Edition and to play with your friends across the globe through "PSN".
+Would you like to unlock the full game?
+
+
+
+ This is the Minecraft: PlayStation®Vita Edition trial game. You need the full game to be able to accept this invite.
+Would you like to unlock the full game?
+
+
+
+ Guest players cannot unlock the full game. Please sign in with a Sony Entertainment Network account.
+
+
+
+ Online ID
+
+
+
+ Brewing
+
+
+
+ You have been returned to the title screen because you have been signed out of the "PSN".
+
+
+
+
+ You've been playing the Minecraft: PlayStation®Vita Edition Trial Game for the maximum time allowed! To continue the fun, would you like to unlock the full game?
+
+
+
+ "Minecraft: PlayStation®Vita Edition" has failed to load, and cannot continue.
+
+
+
+ Failed to join the game as one or more players are not allowed to play Online due to their Sony Entertainment Network account chat restrictions.
+
+
+
+ Failed to create an online game as one or more players are not allowed to play Online due to their Sony Entertainment Network account chat restrictions. Uncheck the "Online Game" box in "More Options" to start an offline game.
+
+
+
+ You are not allowed to join this game session because Online is disabled on your Sony Entertainment Network account due to chat restrictions.
+
+
+
+ You are not allowed to join this game session because one of your local players has Online disabled on their Sony Entertainment Network account due to chat restrictions. Uncheck the "Online Game" box in "More Options" to start an offline game.
+
+
+
+ You are not allowed to create this game session because one of your local players has Online disabled on their Sony Entertainment Network account due to chat restrictions. Uncheck the "Online Game" box in "More Options" to start an offline game.
+
+
+
+ This game has a level autosave feature. When you see the icon above displayed, the game is saving your data.
+Please do not turn off your PlayStation®Vita system while this icon is on-screen.
+
+
+
+ When enabled, the host can toggle their ability to fly, disable exhaustion, and make themselves invisible from the in-game menu. Disables trophies and leaderboard updates.
+
+
+
+ Splitscreen Online ID's
+
+
+
+ Trophies
+
+
+
+ Online ID's:
+
+
+
+ In-Game Online ID's
+
+
+
+ Look what I made in Minecraft: PlayStation®Vita Edition!
+
+
+
+ You are using the trial version of a texture pack. You will have access to the full contents of the texture pack, but you will not be able to save your progress.
+If you try to save while using the trial version, you will be given the option to purchase the full version.
+
+
+ Patch 1.04 (Title Update 14)
+
+
+ SELECT
+
+
+ This option disables trophies and leaderboard updates for this world while playing, and if loading it again after saving with this option on.
+
+
+ Would you like to sign in to the "PSN"?
+
+
+ For players that are not on the same PlayStation®Vita system as the host player, selecting this option will kick the player from the game and any other players on their PlayStation®Vita system. This player will not be able to rejoin the game until it is restarted.
+
+
+ PlayStation®Vita
+
+
+ Change Network Mode
+
+
+ Select Network Mode
+
+
+ Choose Ad Hoc Network to connect with other PlayStation®Vita systems nearby, or "PSN" to connect with friends all over the world.
+
+
+ Ad Hoc Network
+
+
+ "PSN"
+
+
+ Download PS3™ Save
+
+
+ Upload Save for PS3™/PS4™
+
+
+ Upload Canceled
+
+
+ You have canceled uploading this save to the save transfer area.
+
+
+ Uploading data : %d%%
+
+
+ Downloading data : %d%%
+
+
+ Are you sure you would like to upload this save, and overwrite any current save held in the save transfer area?
+
+
+ Converting Data
+
+
+ Saving
+
+
+ Upload Complete!
+
+
+
+ Upload Failed. Please try again later.
+
+
+
+ Download Complete!
+
+
+
+ Download Failed. Please try again later.
+
+
+
+
+ Failed to join the game due to a restrictive NAT type. Please check your network settings.
+
+
+
+
+There is no save available in the save transfer area at the moment.
+You can upload a world save to the save transfer area using Minecraft: PlayStation®3 Edition, and then download it with Minecraft: PlayStation®Vita Edition.
+
+
+
+
+ The save file in the save transfer area has a version number that Minecraft: PlayStation®Vita Edition doesn't support yet.
+
+
+
+ Saving incomplete
+
+
+
+ Minecraft: PlayStation®Vita Edition is out of space for save data. To make room, delete other Minecraft: PlayStation®Vita Edition saves.
+
+
diff --git a/Minecraft.Client/Level/ServerLevel.cpp b/Minecraft.Client/Level/ServerLevel.cpp
index ef6d203f2..025190b7f 100644
--- a/Minecraft.Client/Level/ServerLevel.cpp
+++ b/Minecraft.Client/Level/ServerLevel.cpp
@@ -30,7 +30,7 @@
#include "../../Minecraft.World/Headers/net.minecraft.network.packet.h"
#include "../../Minecraft.World/Util/Mth.h"
#include "../../Minecraft.World/WorldGen/Structures/StructurePiece.h"
-#include "../Minecraft.Client/ServerLevelListener.h"
+#include "./ServerLevelListener.h"
#include "../../Minecraft.World/Util/WeighedTreasure.h"
#include "../Textures/Packs/TexturePackRepository.h"
#include "../Textures/Packs/DLCTexturePack.h"
@@ -710,10 +710,10 @@ std::vector* ServerLevel::fetchTicksInChunk(LevelChunk* chunk,
ChunkPos* pos = chunk->getPos();
// 4jcraft added cast to unsigned
- int west = (unsigned)pos->x << 4;
- int east = west + 16;
- int north = (unsigned)pos->z << 4;
- int south = north + 16;
+ int xMin = ((unsigned)pos->x << 4) - 2;
+ int xMax = (xMin + 16) + 2;
+ int zMin = ((unsigned)pos->z << 4) - 2;
+ int zMax = (zMin + 16) + 2;
delete pos;
for (int i = 0; i < 2; i++) {
diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp
index 74cd3bf38..c3286234c 100644
--- a/Minecraft.Client/Network/PlayerList.cpp
+++ b/Minecraft.Client/Network/PlayerList.cpp
@@ -325,7 +325,7 @@ void PlayerList::placeNewPlayer(Connection* connection,
}
}
-void PlayerList::updateEntireScoreboard(ServerScoreboard* scoreboardstd::,
+void PlayerList::updateEntireScoreboard(ServerScoreboard* scoreboard,
std::shared_ptr player) {
// unordered_set objectives;
diff --git a/Minecraft.Client/Player/ServerPlayer.cpp b/Minecraft.Client/Player/ServerPlayer.cpp
index 108b1697d..eec127e55 100644
--- a/Minecraft.Client/Player/ServerPlayer.cpp
+++ b/Minecraft.Client/Player/ServerPlayer.cpp
@@ -867,7 +867,7 @@ void ServerPlayer::changeDimension(int i) {
// 4J Added delay param
void ServerPlayer::broadcast(std::shared_ptr te,
- bool delay /*= false*/) {
+ bool delay /*= false*/) {
if (te != NULL) {
std::shared_ptr p = te->getUpdatePacket();
if (p != NULL) {
@@ -1064,8 +1064,7 @@ bool ServerPlayer::openContainer(std::shared_ptr container) {
return true;
}
-bool ServerPlayer::openHopper(
- std::shared_ptr container) {
+bool ServerPlayer::openHopper(std::shared_ptr container) {
if (containerMenu == inventoryMenu) {
nextContainerCounter();
connection->send(
@@ -1187,7 +1186,7 @@ bool ServerPlayer::openBeacon(std::shared_ptr beacon) {
}
bool ServerPlayer::openTrading(std::shared_ptr traderTarget,
- const std::wstring& name) {
+ const std::wstring& name) {
if (containerMenu == inventoryMenu) {
nextContainerCounter();
containerMenu = new MerchantMenu(inventory, traderTarget, level);
@@ -1225,8 +1224,8 @@ bool ServerPlayer::openTrading(std::shared_ptr traderTarget,
return true;
}
-bool ServerPlayer::openHorseInventory(
- std::shared_ptr horse, std::shared_ptr container) {
+bool ServerPlayer::openHorseInventory(std::shared_ptr horse,
+ std::shared_ptr container) {
if (containerMenu != inventoryMenu) {
closeContainer();
}
@@ -1243,8 +1242,7 @@ bool ServerPlayer::openHorseInventory(
return true;
}
-void ServerPlayer::slotChanged(AbstractContainerMenu* container,
- int slotIndstd::ex,
+void ServerPlayer::slotChanged(AbstractContainerMenu* container, int slotIndex,
std::shared_ptr item) {
if (dynamic_cast(container->getSlot(slotIndex))) {
return;
@@ -1651,7 +1649,7 @@ void ServerPlayer::completeUsingItem() {
}
void ServerPlayer::startUsingItem(std::shared_ptr instance,
- int duration) {
+ int duration) {
Player::startUsingItem(instance, duration);
if (instance != NULL && instance->getItem() != NULL &&
@@ -1664,7 +1662,7 @@ void ServerPlayer::startUsingItem(std::shared_ptr instance,
}
void ServerPlayer::restoreFrom(std::shared_ptr oldPlayer,
- bool restoreAll) {
+ bool restoreAll) {
Player::restoreFrom(oldPlayer, restoreAll);
lastSentExp = -1;
lastSentHealth = -1;
@@ -1725,8 +1723,7 @@ void ServerPlayer::setGameMode(GameType* mode) {
void ServerPlayer::sendMessage(
const std::wstring& message,
ChatPacket::EChatPacketMessage type /*= e_ChatCustom*/,
- int customData /*= -1*/,
- const std::wstring& additionalMessage /*= L""*/) {
+ int customData /*= -1*/, const std::wstring& additionalMessage /*= L""*/) {
connection->send(std::shared_ptr(
new ChatPacket(message, type, customData, additionalMessage)));
}
diff --git a/Minecraft.Client/Rendering/EntityRenderers/HorseRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/HorseRenderer.cpp
index 963053f25..7b903fc4b 100644
--- a/Minecraft.Client/Rendering/EntityRenderers/HorseRenderer.cpp
+++ b/Minecraft.Client/Rendering/EntityRenderers/HorseRenderer.cpp
@@ -49,7 +49,8 @@ void HorseRenderer::renderModel(std::shared_ptr mob, float wp,
true);
// Ensure that any extra layers of texturing are disabled after
// rendering this horse
- RenderManager.TextureBind(1, -1);
+ assert(0 && "TODO: implement TextureBind(layer, idx) properly");
+ // RenderManager.TextureBind(1, -1);
}
}
diff --git a/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp
index cc318adf0..69d49339b 100644
--- a/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp
+++ b/Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp
@@ -8,7 +8,7 @@
#include "PlayerRenderer.h"
#include "EntityRenderDispatcher.h"
#include "../Lighting.h"
-#include "MultiPlayerLocalPlayer.h"
+#include "../../Player/MultiPlayerLocalPlayer.h"
#include "../Minimap.h"
#include "../../Level/MultiPlayerLevel.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.item.h"
diff --git a/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp b/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp
index 33cc8d933..1bc927694 100644
--- a/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp
+++ b/Minecraft.Client/Rendering/EntityRenderers/PistonPieceRenderer.cpp
@@ -5,7 +5,7 @@
#include "../../Textures/TextureAtlas.h"
#include "TileRenderer.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../Minecraft.World/PistonPieceEntity.h"
+#include "../Minecraft.World/PistonPieceTileEntity.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.h"
ResourceLocation PistonPieceRenderer::SIGN_LOCATION =
diff --git a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp
index 25e9553fe..4568dc500 100644
--- a/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp
+++ b/Minecraft.Client/Rendering/EntityRenderers/TileEntityRenderDispatcher.cpp
@@ -4,7 +4,7 @@
#include "../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.entity.player.h"
#include "../../../Minecraft.World/Headers/net.minecraft.world.level.h"
-#include "../Minecraft.World/PistonPieceEntity.h"
+#include "../../../Minecraft.World/Blocks/TileEntities/PistonPieceTileEntity.h"
#include "SignRenderer.h"
#include "MobSpawnerRenderer.h"
#include "PistonPieceRenderer.h"
diff --git a/Minecraft.Client/Rendering/Models/ModelPart.h b/Minecraft.Client/Rendering/Models/ModelPart.h
index 6c2356a1b..9d71b297a 100644
--- a/Minecraft.Client/Rendering/Models/ModelPart.h
+++ b/Minecraft.Client/Rendering/Models/ModelPart.h
@@ -3,7 +3,7 @@
#include "../Vertex.h"
#include "../Polygon.h"
#include "Model.h"
-#include "../Minecraft.Client/SkinBox.h"
+#include "./SkinBox.h"
class Cube;
diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build
index 37a1ec811..e7f1b559e 100644
--- a/Minecraft.Client/meson.build
+++ b/Minecraft.Client/meson.build
@@ -22,9 +22,9 @@ exclude_platform_common_sources = [
' ! -path "*/XUI/*"',
# we use system zlib instead, since this one is old as hell and isn't configured for linux correctly
' ! -path "*/zlib/*"',
- ' ! -path "*/GameState/SurvivalMode.cpp"',
- ' ! -path "*/GameState/CreativeMode.cpp"',
- ' ! -path "*/GameState/GameMode.cpp"',
+ ' ! -name "SurvivalMode.cpp"',
+ ' ! -name "CreativeMode.cpp"',
+ ' ! -name "GameMode.cpp"',
]
# all sources in in ./Platform/Common
diff --git a/Minecraft.World/Network/Packets/Packet.cpp b/Minecraft.World/Network/Packets/Packet.cpp
index d6e540a99..b071f0a2c 100644
--- a/Minecraft.World/Network/Packets/Packet.cpp
+++ b/Minecraft.World/Network/Packets/Packet.cpp
@@ -499,7 +499,7 @@ std::wstring Packet::readUtf(DataInputStream* dis,
{
short stringLength = dis->readShort();
if (stringLength > maxLength) {
- wstringstream stream;
+ std::wstringstream stream;
stream << L"Received string length longer than maximum allowed ("
<< stringLength << " > " << maxLength << ")";
assert(false);