backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-06-09 02:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

a bunch of shit lmaoo

Browse source
This commit is contained in:
piebot 2026-03-25 21:41:35 +03:00
parent 571bf2f226
commit e14ba14e68
24 changed files with 2747 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Minecraft.Client/Common/Media/MediaWindows64.arc
View file

Binary file not shown.

97
Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
View file

@ -9006,5 +9006,102 @@ All Ender Chests in a world are linked. Items placed into an Ender Chest are acc
<data name="IDS_WINDOWS_EXIT">
<value>Exit Minecraft</value>
</data>
<data name="IDS_TILE_PACKED_ICE">
<value>Packed Ice</value>
</data>
<data name="IDS_DESC_PACKED_ICE">
<value>A solid unmeltable block of ice that can have objects placed on it.</value>
</data>
<data name="IDS_TILE_RED_SANDSTONE_CHISELED">
<value>Chiseled Red Sandstone</value>
</data>
<data name="IDS_TILE_RED_SANDSTONE_SMOOTH">
<value>Smooth Red Sandstone</value>
</data>
<data name="IDS_DESC_RED_SANDSTONE">
<value>Red colored Sandstone. It is not influenced by gravity like normal Sand.</value>
</data>
<data name="IDS_DESC_SEA_LANTERN">
<value>Underwater light sources that can be found in Ocean Monuments. Can be crafted from Prismarine shards and Prismarine crystals.</value>
</data>
<data name="IDS_TILE_PRISMARINE">
<value>Prismarine</value>
</data>
<data name="IDS_DESC_PRISMARINE">
<value>Rare decorative stone that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_DESC_DOUBLE_TALL_GRASS">
<value>PLACEHOLDER</value>
</data>
<data name="IDS_TILE_DOUBLE_TALL_GRASS">
<value>Double Tall Grass</value>
</data>
<data name="IDS_TILE_SUNFLOWER">
<value>Sunflower</value>
</data>
<data name="IDS_TILE_LARGE_FERN">
<value>Large Fern</value>
</data>
<data name="IDS_TILE_LILAC">
<value>Lilac</value>
</data>
<data name="IDS_TILE_ROSE_BUSH">
<value>Rose Bush</value>
</data>
<data name="IDS_TILE_PEONY">
<value>Peony</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD">
<value>Prismarine Shard</value>
</data>
<data name="IDS_ITEM_PRISMARINE_SHARD_DESC">
<value>Dropped by Guardians and Elder Guardians. Can be used in crafting Prismarine and Sea Lanterns.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_CRYSTAL_DESC">
<value>Obtained from Sea Lanterns or by defeating Guardians and Elder Guardians. Can be used in crafting Sea Lanterns.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_DESC">
<value>Rare decorative stone that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_BRICK_DESC">
<value>Decorative Prismarine brick that can be found in Ocean Monuments. Can be crafted from Prismarine shards.</value>
</data>
<data name="IDS_ITEM_PRISMARINE_DARK_DESC">
<value>A rarer form of Prismarine that can be found in Ocean Monuments. Can be crafted with Prismarine shards and an Ink Sac.</value>
</data>
<data name="IDS_TILE_PRISMARINE">
<value>Prismarine</value>
</data>
<data name="IDS_TILE_PRISMARINE_BRICKS">
<value>Prismarine Bricks</value>
</data>
<data name="IDS_TILE_PRISMARINE_DARK">
<value>Dark Prismarine</value>
</data>
</root>

2484
Minecraft.Client/Windows64Media/old_strings.h Normal file
View file

File diff suppressed because it is too large Load diff

186
Minecraft.Client/Windows64Media/strings.h
View file

@ -2352,133 +2352,67 @@
#define IDS_ITEM_PRISMARINE_CRYSTAL_DESC 2346
#define IDS_ITEM_PRISMARINE_SHARD_DESC 2347
#define IDS_ITEM_RABBIT_STEW 2348
#define IDS_TILE_TALL_GRASS2 2349
#define IDS_TILE_DOUBLE_TALL_GRASS 2349
#define IDS_TILE_LARGE_FERN 2350
#define IDS_TILE_LILAC 2351
#define IDS_TILE_ROSE_BUSH 2352
#define IDS_TILE_PEONY 2353
#define IDS_WINDOWS_EXIT 2162
#define IDS_LANG_SYSTEM 2163
#define IDS_LANG_ENGLISH 2164
#define IDS_LANG_GERMAN 2165
#define IDS_LANG_SPANISH 2166
#define IDS_LANG_SPANISH_SPAIN 2167
#define IDS_LANG_SPANISH_LATIN_AMERICA 2168
#define IDS_LANG_FRENCH 2169
#define IDS_LANG_ITALIAN 2170
#define IDS_LANG_PORTUGUESE 2171
#define IDS_LANG_PORTUGUESE_PORTUGAL 2172
#define IDS_LANG_PORTUGUESE_BRAZIL 2173
#define IDS_LANG_JAPANESE 2174
#define IDS_LANG_KOREAN 2175
#define IDS_LANG_CHINESE_TRADITIONAL 2176
#define IDS_LANG_CHINESE_SIMPLIFIED 2177
#define IDS_LANG_DANISH 2178
#define IDS_LANG_FINISH 2179
#define IDS_LANG_DUTCH 2180
#define IDS_LANG_POLISH 2181
#define IDS_LANG_RUSSIAN 2182
#define IDS_LANG_SWEDISH 2183
#define IDS_LANG_NORWEGIAN 2184
#define IDS_LANG_GREEK 2185
#define IDS_LANG_TURKISH 2186
#define IDS_LEADERBOARD_KILLS_EASY 2187
#define IDS_LEADERBOARD_KILLS_NORMAL 2188
#define IDS_LEADERBOARD_KILLS_HARD 2189
#define IDS_LEADERBOARD_MINING_BLOCKS_PEACEFUL 2190
#define IDS_LEADERBOARD_MINING_BLOCKS_EASY 2191
#define IDS_LEADERBOARD_MINING_BLOCKS_NORMAL 2192
#define IDS_LEADERBOARD_MINING_BLOCKS_HARD 2193
#define IDS_LEADERBOARD_FARMING_PEACEFUL 2194
#define IDS_LEADERBOARD_FARMING_EASY 2195
#define IDS_LEADERBOARD_FARMING_NORMAL 2196
#define IDS_LEADERBOARD_FARMING_HARD 2197
#define IDS_LEADERBOARD_TRAVELLING_PEACEFUL 2198
#define IDS_LEADERBOARD_TRAVELLING_EASY 2199
#define IDS_LEADERBOARD_TRAVELLING_NORMAL 2200
#define IDS_LEADERBOARD_TRAVELLING_HARD 2201
#define IDS_TIPS_GAMETIP_0 2202
#define IDS_TIPS_GAMETIP_1 2203
#define IDS_TIPS_GAMETIP_48 2204
#define IDS_TIPS_GAMETIP_44 2205
#define IDS_TIPS_GAMETIP_45 2206
#define IDS_TIPS_TRIVIA_4 2207
#define IDS_TIPS_TRIVIA_17 2208
#define IDS_HOW_TO_PLAY_MULTIPLAYER 2209
#define IDS_HOW_TO_PLAY_SOCIALMEDIA 2210
#define IDS_HOW_TO_PLAY_CREATIVE 2211
#define IDS_TUTORIAL_TASK_FLY 2212
#define IDS_TOOLTIPS_SELECTDEVICE 2213
#define IDS_TOOLTIPS_CHANGEDEVICE 2214
#define IDS_TOOLTIPS_VIEW_GAMERCARD 2215
#define IDS_TOOLTIPS_VIEW_GAMERPROFILE 2216
#define IDS_TOOLTIPS_INVITE_PARTY 2217
#define IDS_CONFIRM_START_CREATIVE 2218
#define IDS_CONFIRM_START_SAVEDINCREATIVE 2219
#define IDS_CONFIRM_START_SAVEDINCREATIVE_CONTINUE 2220
#define IDS_CONFIRM_START_HOST_PRIVILEGES 2221
#define IDS_CONNECTION_LOST_LIVE 2222
#define IDS_CONNECTION_LOST_LIVE_NO_EXIT 2223
#define IDS_AWARD_AVATAR1 2224
#define IDS_AWARD_AVATAR2 2225
#define IDS_AWARD_AVATAR3 2226
#define IDS_AWARD_THEME 2227
#define IDS_UNLOCK_ACHIEVEMENT_TEXT 2228
#define IDS_UNLOCK_AVATAR_TEXT 2229
#define IDS_UNLOCK_GAMERPIC_TEXT 2230
#define IDS_UNLOCK_THEME_TEXT 2231
#define IDS_UNLOCK_ACCEPT_INVITE 2232
#define IDS_UNLOCK_GUEST_TEXT 2233
#define IDS_LEADERBOARD_GAMERTAG 2234
#define IDS_GROUPNAME_POTIONS_480 2235
#define IDS_RETURNEDTOTITLESCREEN_TEXT 2236
#define IDS_TRIALOVER_TEXT 2237
#define IDS_FATAL_ERROR_TEXT 2238
#define IDS_NO_MULTIPLAYER_PRIVILEGE_JOIN_TEXT 2239
#define IDS_NO_MULTIPLAYER_PRIVILEGE_HOST_TEXT 2240
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL 2241
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL 2242
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_REMOTE 2243
#define IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_CREATE 2244
#define IDS_SAVE_ICON_MESSAGE 2245
#define IDS_GAMEOPTION_HOST_PRIVILEGES 2246
#define IDS_CHECKBOX_DISPLAY_SPLITSCREENGAMERTAGS 2247
#define IDS_ACHIEVEMENTS 2248
#define IDS_LABEL_GAMERTAGS 2249
#define IDS_IN_GAME_GAMERTAGS 2250
#define IDS_SOCIAL_DEFAULT_DESCRIPTION 2251
#define IDS_TITLE_UPDATE_NAME 2252
#define IDS_PLATFORM_NAME 2253
#define IDS_BACK_BUTTON 2254
#define IDS_HOST_OPTION_DISABLES_ACHIEVEMENTS 2255
#define IDS_KICK_PLAYER_DESCRIPTION 2256
#define IDS_USING_TRIAL_TEXUREPACK_WARNING 2257
#define IDS_WORLD_SIZE_TITLE_SMALL 2258
#define IDS_WORLD_SIZE_TITLE_MEDIUM 2259
#define IDS_WORLD_SIZE_TITLE_LARGE 2260
#define IDS_WORLD_SIZE_TITLE_CLASSIC 2261
#define IDS_WORLD_SIZE 2262
#define IDS_GAMEOPTION_WORLD_SIZE 2263
#define IDS_DISABLE_SAVING 2264
#define IDS_GAMEOPTION_DISABLE_SAVING 2265
#define IDS_RICHPRESENCE_GAMESTATE 2266
#define IDS_RICHPRESENCE_IDLE 2267
#define IDS_RICHPRESENCE_MENUS 2268
#define IDS_RICHPRESENCE_MULTIPLAYER 2269
#define IDS_RICHPRESENCE_MULTIPLAYEROFFLINE 2270
#define IDS_RICHPRESENCE_MULTIPLAYER_1P 2271
#define IDS_RICHPRESENCE_MULTIPLAYER_1POFFLINE 2272
#define IDS_RICHPRESENCESTATE_BLANK 2273
#define IDS_RICHPRESENCESTATE_RIDING_PIG 2274
#define IDS_RICHPRESENCESTATE_RIDING_MINECART 2275
#define IDS_RICHPRESENCESTATE_BOATING 2276
#define IDS_RICHPRESENCESTATE_FISHING 2277
#define IDS_RICHPRESENCESTATE_CRAFTING 2278
#define IDS_RICHPRESENCESTATE_FORGING 2279
#define IDS_RICHPRESENCESTATE_NETHER 2280
#define IDS_RICHPRESENCESTATE_CD 2281
#define IDS_RICHPRESENCESTATE_MAP 2282
#define IDS_RICHPRESENCESTATE_ENCHANTING 2283
#define IDS_RICHPRESENCESTATE_BREWING 2284
#define IDS_RICHPRESENCESTATE_ANVIL 2285
#define IDS_RICHPRESENCESTATE_TRADING 2286
#define IDS_TILE_PACKED_ICE 2354
#define IDS_TILE_SUNFLOWER 2355
#define IDS_DESC_PACKED_ICE 2356
#define IDS_DESC_RED_SANDSTONE 2357
#define IDS_DESC_SEA_LANTERN 2358
#define IDS_DESC_PRISMARINE 2359
#define IDS_DESC_DOUBLE_TALL_GRASS 2360
#define IDS_TILE_RED_SANDSTONE_CHISELED 2361
#define IDS_TILE_RED_SANDSTONE_SMOOTH 2362
#define IDS_WINDOWS_EXIT 2363
#define IDS_TILE_PODZOL 2364
#define IDS_TILE_COARSE_DIRT 2365
#define IDS_DESC_PODZOL 2366
#define IDS_DESC_COARSE_DIRT 2367
#define IDS_TILE_GRANITE 2368
#define IDS_TILE_POLISHED_GRANITE 2369
#define IDS_TILE_ANDESITE 2370
#define IDS_TILE_POLISHED_ANDESITE 2371
#define IDS_TILE_DIORITE 2372
#define IDS_TILE_POLISHED_DIORITE 2373
#define IDS_DESC_GRANITE 2374
#define IDS_DESC_POLISHED_GRANITE 2375
#define IDS_DESC_ANDESITE 2376
#define IDS_DESC_POLISHED_ANDESITE 2377
#define IDS_DESC_DIORITE 2378
#define IDS_DESC_POLISHED_DIORITE 2379
#define IDS_TILE_RED_SAND 2380
#define IDS_TILE_WET_SPONGE 2381
#define IDS_DESC_WET_SPONGE 2382
#define IDS_ITEM_SALMON_RAW 2383
#define IDS_ITEM_SALMON_COOKED 2384
#define IDS_ITEM_CLOWNFISH 2385
#define IDS_ITEM_PUFFERFISH 2386
#define IDS_DESC_SALMON_RAW 2387
#define IDS_DESC_SALMON_COOKED 2388
#define IDS_DESC_CLOWNFISH 2389
#define IDS_DESC_PUFFERFISH 2390
#define IDS_TILE_BLUE_ORCHID 2391
#define IDS_TILE_ALLIUM 2392
#define IDS_TILE_HOUSTONIA 2393
#define IDS_TILE_TULIP_RED 2394
#define IDS_TILE_TULIP_ORANGE 2395
#define IDS_TILE_TULIP_WHITE 2396
#define IDS_TILE_TULIP_PINK 2397
#define IDS_TILE_OXEYE_DAISY 2398
#define IDS_DESC_ROSE 2399
#define IDS_DESC_BLUE_ORCHID 2400
#define IDS_DESC_ALLIUM 2401
#define IDS_DESC_HOUSTONIA 2402
#define IDS_DESC_TULIP_RED 2403
#define IDS_DESC_TULIP_ORANGE 2404
#define IDS_DESC_TULIP_WHITE 2405
#define IDS_DESC_TULIP_PINK 2406
#define IDS_DESC_OXEYE_DAISY 2407
#define IDS_DESC_SUNFLOWER 2408
#define IDS_DESC_LILAC 2409
#define IDS_DESC_LARGE_FERN 2410
#define IDS_DESC_ROSE_BUSH 2411
#define IDS_DESC_PEONY 2412

11
Minecraft.World/DirtTile.cpp
View file

@ -4,8 +4,13 @@
#include "net.minecraft.h"
const unsigned int DirtTile::DIRT_NAMES[DIRT_NAMES_LENGTH] = { IDS_TILE_DIRT,
IDS_TILE_DIRT,
IDS_TILE_DIRT
IDS_TILE_PODZOL,
IDS_TILE_COARSE_DIRT
};
const unsigned int DirtTile::DIRT_DESCRIPTIONS[DIRT_NAMES_LENGTH] = { IDS_DESC_DIRT,
IDS_DESC_PODZOL,
IDS_DESC_COARSE_DIRT
};
const wstring DirtTile::TEXTURE_NAMES[] = { L"dirt", L"coarse_dirt", L"dirt_podzol"};
@ -21,7 +26,7 @@ unsigned int DirtTile::getDescriptionId(int iData)
{
if (iData < 0 || iData >= DIRT_NAMES_LENGTH) iData = 0;
return DIRT_NAMES[iData];
return DIRT_DESCRIPTIONS[iData];
}
int DirtTile::getSpawnResourcesAuxValue(int data)

1
Minecraft.World/DirtTile.h
View file

@ -11,6 +11,7 @@ public:
static const int DIRT_NAMES_LENGTH = 3;
static const unsigned int DIRT_NAMES[DIRT_NAMES_LENGTH];
static const unsigned int DIRT_DESCRIPTIONS[DIRT_NAMES_LENGTH];
static const wstring TEXTURE_NAMES[];
private:
Icon** icons;

2
Minecraft.World/DoublePlantFeature.cpp
View file

@ -11,7 +11,7 @@ DoublePlantFeature::DoublePlantFeature(bool doUpdate)
void DoublePlantFeature::setPlantType(int plantType)
{
m_plantType = plantType;
m_plantType = (plantType < 1) ? 1 : plantType;
}
bool DoublePlantFeature::place(Level* level, Random* rand, int x, int y, int z)

15
Minecraft.World/FishFoodItem.cpp
View file

@ -8,8 +8,11 @@
#include "net.minecraft.world.h"
#include "FishFoodItem.h"
const unsigned int FishFoodItem::NAMES[FISH_COUNT] = { IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_SKELETON, IDS_ITEM_SKULL_SKELETON };
const unsigned int FishFoodItem::COOKED_NAMES[FISH_COUNT] = { IDS_ITEM_SKULL_CHARACTER, IDS_ITEM_SKULL_CHARACTER, IDS_ITEM_SKULL_CHARACTER, IDS_ITEM_SKULL_CHARACTER };
const unsigned int FishFoodItem::NAMES[FISH_COUNT] = { IDS_ITEM_FISH_RAW, IDS_ITEM_SALMON_RAW, IDS_ITEM_CLOWNFISH, IDS_ITEM_PUFFERFISH };
const unsigned int FishFoodItem::COOKED_NAMES[FISH_COUNT] = { IDS_DESC_FISH_COOKED, IDS_ITEM_SALMON_COOKED, NULL, NULL };
const unsigned int FishFoodItem::DESCRIPTIONS[FISH_COUNT] = { IDS_DESC_FISH_RAW, IDS_DESC_SALMON_RAW, IDS_DESC_CLOWNFISH, IDS_DESC_PUFFERFISH };
const unsigned int FishFoodItem::COOKED_DESCRIPTIONS[FISH_COUNT] = { IDS_DESC_FISH_COOKED, IDS_DESC_SALMON_COOKED, NULL, NULL };
// making cod temporarily fish
const FishType FISH_TYPES[] = {
{ 0, L"fish", 2, 0.1f, 5, 0.6f, true },
@ -74,10 +77,10 @@ unsigned int FishFoodItem::getDescriptionId(int iData)
iData = 0;
}
if (cooked) {
return COOKED_NAMES[iData];
}
return NAMES[iData];
if (cooked)
return COOKED_DESCRIPTIONS[iData];
return DESCRIPTIONS[iData];
}
unsigned int FishFoodItem::getDescriptionId(shared_ptr<ItemInstance> instance)

4
Minecraft.World/FishFoodItem.h
View file

@ -22,6 +22,10 @@ class FishFoodItem : public FoodItem
public:
static const unsigned int NAMES[FISH_COUNT];
static const unsigned int COOKED_NAMES[FISH_COUNT];
static const unsigned int DESCRIPTIONS[FISH_COUNT];
static const unsigned int COOKED_DESCRIPTIONS[FISH_COUNT];
int auxValue;
bool cooked;
private:

2
Minecraft.World/RedSandStoneTile.cpp
View file

@ -9,7 +9,7 @@ const wstring RedSandStoneTile::TEXTURE_BOTTOM = L"red_sandstone_bottom";
const wstring RedSandStoneTile::TEXTURE_NAMES[] = { L"red_sandstone_normal", L"red_sandstone_carved", L"red_sandstone_smooth" };
int RedSandStoneTile::SANDSTONE_NAMES[SANDSTONE_BLOCK_NAMES] = {
IDS_TILE_SANDSTONE, IDS_TILE_SANDSTONE_CHISELED, IDS_TILE_SANDSTONE_SMOOTH
IDS_TILE_RED_SANDSTONE, IDS_TILE_RED_SANDSTONE_CHISELED, IDS_TILE_RED_SANDSTONE_SMOOTH
};
RedSandStoneTile::RedSandStoneTile(int id) : Tile(id, Material::stone)

20
Minecraft.World/Rose.cpp
View file

@ -4,15 +4,15 @@
#include "GrassTile.h"
#include "Rose.h"
const unsigned int Rose::FLOWER_NAMES[FLOWER_NAMES_LENGTH] = { IDS_TILE_ROSE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE };
const unsigned int Rose::FLOWER_NAMES[FLOWER_NAMES_LENGTH] = {
IDS_TILE_ROSE, IDS_TILE_BLUE_ORCHID, IDS_TILE_ALLIUM, IDS_TILE_HOUSTONIA, IDS_TILE_TULIP_RED,
IDS_TILE_TULIP_ORANGE, IDS_TILE_TULIP_WHITE, IDS_TILE_TULIP_PINK, IDS_TILE_OXEYE_DAISY
};
const unsigned int Rose::FLOWER_DESCRIPTIONS[FLOWER_NAMES_LENGTH] = {
IDS_DESC_ROSE, IDS_DESC_BLUE_ORCHID, IDS_DESC_ALLIUM, IDS_DESC_HOUSTONIA, IDS_DESC_TULIP_RED,
IDS_DESC_TULIP_ORANGE, IDS_DESC_TULIP_WHITE, IDS_DESC_TULIP_PINK, IDS_DESC_OXEYE_DAISY
};
const wstring Rose::TEXTURE_NAMES[] = {
L"flower_rose",
@ -60,7 +60,7 @@ unsigned int Rose::getDescriptionId(int iData)
{
if (iData < 0 || iData >= FLOWER_NAMES_LENGTH) iData = 0;
return FLOWER_NAMES[iData];
return FLOWER_DESCRIPTIONS[iData];
}
int Rose::getSpawnResourcesAuxValue(int data)

1
Minecraft.World/Rose.h
View file

@ -21,6 +21,7 @@ public:
static const int FLOWER_NAMES_LENGTH = 9;
static const unsigned int FLOWER_NAMES[FLOWER_NAMES_LENGTH];
static const unsigned int FLOWER_DESCRIPTIONS[FLOWER_NAMES_LENGTH];
static const wstring TEXTURE_NAMES[];
private:

2
Minecraft.World/SandTile.cpp
View file

@ -5,7 +5,7 @@
#include "FireTile.h"
#include "net.minecraft.world.h"
const unsigned int SandTile::SAND_NAMES[SAND_NAMES_LENGTH] = { IDS_TILE_SAND, IDS_TILE_SAND };
const unsigned int SandTile::SAND_NAMES[SAND_NAMES_LENGTH] = { IDS_TILE_SAND, IDS_TILE_RED_SAND };
const wstring SandTile::TEXTURE_NAMES[] = { L"sand", L"red_sand" };
SandTile::SandTile(int type, bool isSolidRender) : HeavyTile(type, Material::sand, isSolidRender)

10
Minecraft.World/Sponge.cpp
View file

@ -5,7 +5,8 @@
#include "Sponge.h"
const unsigned int Sponge::SPONGE_NAMES[SPONGE_NAMES_LENGTH] = { IDS_TILE_SPONGE, IDS_TILE_SPONGE };
const unsigned int Sponge::SPONGE_NAMES[SPONGE_NAMES_LENGTH] = { IDS_TILE_SPONGE, IDS_TILE_WET_SPONGE };
const unsigned int Sponge::SPONGE_DESCRIPTIONS[SPONGE_NAMES_LENGTH] = { IDS_DESC_SPONGE, IDS_DESC_WET_SPONGE };
Sponge::Sponge(int id) : Tile(id, Material::sponge)
{
@ -20,6 +21,13 @@ void Sponge::onPlace(Level *level, int x, int y, int z)
tryAbsorb(level, x, y, z);
}
unsigned int Sponge::getDescriptionId(int iData)
{
if (iData < 0 || iData >= SPONGE_NAMES_LENGTH) iData = 0;
return SPONGE_DESCRIPTIONS[iData];
}
void Sponge::neighborChanged(Level* level, int x, int y, int z, int type)
{
tryAbsorb(level, x, y, z);

2
Minecraft.World/Sponge.h
View file

@ -10,6 +10,7 @@ public:
static const unsigned int SPONGE_NAMES[SPONGE_NAMES_LENGTH];
static const unsigned int SPONGE_DESCRIPTIONS[SPONGE_NAMES_LENGTH];
static const wstring TEXTURE_NAMES[];
bool wet;
@ -24,6 +25,7 @@ protected:
bool absorb(Level* level, int x, int y, int z);
void animateTick(Level* level, int x, int y, int z, Random* random);
void registerIcons(IconRegister* iconRegister);
unsigned int getDescriptionId(int iData);
Icon* getTexture(int face, int data);
int getSpawnResourcesAuxValue(int data);
};

18
Minecraft.World/StoneTile.cpp
View file

@ -4,12 +4,16 @@
#include "net.minecraft.h"
const unsigned int StoneTile::STONE_NAMES[STONE_NAMES_LENGTH] = { IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE,
IDS_TILE_STONE };
IDS_TILE_GRANITE, IDS_TILE_POLISHED_GRANITE,
IDS_TILE_DIORITE, IDS_TILE_POLISHED_DIORITE,
IDS_TILE_ANDESITE, IDS_TILE_POLISHED_ANDESITE
};
const unsigned int StoneTile::STONE_DESCRIPTIONS[STONE_NAMES_LENGTH] = { IDS_DESC_STONE,
IDS_DESC_GRANITE, IDS_DESC_POLISHED_GRANITE,
IDS_DESC_DIORITE, IDS_DESC_POLISHED_DIORITE,
IDS_DESC_ANDESITE, IDS_DESC_POLISHED_ANDESITE
};
const wstring StoneTile::TEXTURE_NAMES[] = { L"stone",
L"stone_granite", L"stone_granite_smooth",
@ -25,7 +29,7 @@ unsigned int StoneTile::getDescriptionId(int iData)
{
if (iData < 0 || iData >= STONE_NAMES_LENGTH) iData = 0;
return STONE_NAMES[iData];
return STONE_DESCRIPTIONS[iData];
}
int StoneTile::getResource(int data, Random* random, int playerBonusLevel)

1
Minecraft.World/StoneTile.h
View file

@ -15,6 +15,7 @@ public:
static const int STONE_NAMES_LENGTH = 7;
static const unsigned int STONE_DESCRIPTIONS[STONE_NAMES_LENGTH];
static const unsigned int STONE_NAMES[STONE_NAMES_LENGTH];
static const wstring TEXTURE_NAMES[];
private:

34
Minecraft.World/Tallgrass2.cpp
View file

@ -9,34 +9,46 @@
#include "net.minecraft.stats.h"
static const unsigned int DESCRIPTION_IDS[TallGrass2::VARIANT_COUNT] = {
IDS_TILE_TALL_GRASS2, // 0 - Tall Grass
IDS_TILE_LARGE_FERN, // 1 - Large Fern
IDS_TILE_LILAC, // 2 - Lilac
IDS_TILE_ROSE_BUSH, // 3 - Rose Bush
IDS_TILE_PEONY, // 4 - Peony
// tranq please i beg you make sure the ids are correct so we dont get corrupted worlds from people
static const int TILE_IDS[TallGrass2::VARIANT_COUNT] = {
IDS_TILE_SUNFLOWER, // 0 - Sunflower, not implemented yet
IDS_TILE_LILAC, // 1 - Lilac
IDS_TILE_DOUBLE_TALL_GRASS, // 2 - Tall Grass
IDS_TILE_LARGE_FERN, // 3 - Large Fern
IDS_TILE_ROSE_BUSH, // 4 - Rose Bush
IDS_TILE_PEONY, // 5 - Peony
};
static const int DESCRIPTION_IDS[TallGrass2::VARIANT_COUNT] = {
IDS_DESC_SUNFLOWER, // 0 - Sunflower, not implemented yet
IDS_DESC_LILAC, // 1 - Lilac
IDS_DESC_DOUBLE_TALL_GRASS, // 2 - Tall Grass
IDS_DESC_LARGE_FERN, // 3 - Large Fern
IDS_DESC_ROSE_BUSH, // 4 - Rose Bush
IDS_DESC_PEONY, // 5 - Peony
};
static const wstring TEXTURE_BOTTOM[TallGrass2::VARIANT_COUNT] = {
L"tallgrass2_tall_grass_lower", // Sunflower, not implemented yet
L"tallgrass2_lilac_lower",
L"tallgrass2_tall_grass_lower",
L"tallgrass2_large_fern_lower",
L"tallgrass2_lilac_lower",
L"tallgrass2_rose_bush_lower",
L"tallgrass2_peony_lower",
};
static const wstring TEXTURE_TOP[TallGrass2::VARIANT_COUNT] = {
L"tallgrass2_tall_grass_upper", // Sunflower, not implemented yet
L"tallgrass2_lilac_upper",
L"tallgrass2_tall_grass_upper",
L"tallgrass2_large_fern_upper",
L"tallgrass2_lilac_upper",
L"tallgrass2_rose_bush_upper",
L"tallgrass2_peony_upper",
L"tallgrass2_peony_upper"
};
TallGrass2::TallGrass2(int id)
: Bush(id, Material::replaceable_plant)
TallGrass2::TallGrass2(int id) : Bush(id, Material::replaceable_plant)
{
this->updateDefaultShape();
}

13
Minecraft.World/Tallgrass2.h
View file

@ -5,12 +5,13 @@ class TallGrass2 : public Bush
{
friend class Tile;
public:
static const int TALL_GRASS = 0;
static const int LARGE_FERN = 1;
static const int LILAC = 2;
static const int ROSE_BUSH = 3;
static const int PEONY = 4;
static const int VARIANT_COUNT = 5;
static const int SUNFLOWER = 0;
static const int LILAC = 1;
static const int TALL_GRASS = 2;
static const int LARGE_FERN = 3;
static const int ROSE_BUSH = 4;
static const int PEONY = 5;
static const int VARIANT_COUNT = 6;
static const int UPPER_BIT = 8;

25
Minecraft.World/Tile.cpp
View file

@ -362,7 +362,7 @@ void Tile::staticCtor()
Tile::wool = (new ColoredTile(35, Material::cloth)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_cloth, Item::eMaterial_cloth)->setDestroyTime(0.8f)->setSoundType(Tile::SOUND_CLOTH)->setIconName(L"wool_colored")->setDescriptionId(IDS_TILE_CLOTH)->sendTileData()->setUseDescriptionId(IDS_DESC_WOOL);
Tile::pistonMovingPiece = static_cast<PistonMovingPiece *>((new PistonMovingPiece(36))->setDescriptionId(IDS_TILE_PISTON_BASE)->setUseDescriptionId(-1));
Tile::flower = static_cast<Bush *>((new Bush(37))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_dandelion")->setDescriptionId(IDS_TILE_FLOWER)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
Tile::rose = static_cast<Bush *>((new Rose(38))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_rose")->setDescriptionId(IDS_TILE_ROSE)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
Tile::rose = static_cast<Bush *>((new Rose(38))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_rose")->disableMipmap());
Tile::mushroom_brown = static_cast<Bush *>((new Mushroom(39))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setLightEmission(2 / 16.0f)->setIconName(L"mushroom_brown")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap());
Tile::mushroom_red = static_cast<Bush *>((new Mushroom(40))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"mushroom_red")->setDescriptionId(IDS_TILE_MUSHROOM)->setUseDescriptionId(IDS_DESC_MUSHROOM)->disableMipmap());
@ -508,6 +508,7 @@ void Tile::staticCtor()
Tile::dropper = (new DropperTile(158)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_redstoneContainer, Item::eMaterial_undefined)->setDestroyTime(3.5f)->setSoundType(SOUND_STONE)->setIconName(L"dropper")->setDescriptionId(IDS_TILE_DROPPER)->setUseDescriptionId(IDS_DESC_DROPPER);
Tile::clayHardened_colored = (new ColoredTile(159, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay, Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay_stained")->setDescriptionId(IDS_TILE_STAINED_CLAY)->setUseDescriptionId(IDS_DESC_STAINED_CLAY);
Tile::stained_glass_pane = (new StainedGlassPaneBlock(160)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_glass, Item::eMaterial_glass)->setDestroyTime(0.3f)->setSoundType(SOUND_GLASS)->setIconName(L"glass")->setDescriptionId(IDS_TILE_STAINED_GLASS_PANE)->setUseDescriptionId(IDS_DESC_STAINED_GLASS_PANE);
//
Tile::tree2Trunk = (new TreeTile2(162))->setDestroyTime(2.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->sendTileData()->setUseDescriptionId(IDS_DESC_LOG);
Tile::woodStairsAcacia = (new StairTile(163, Tile::wood, TreeTile::ACACIA_TRUNK))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_acaciawood)->setIconName(L"stairsWoodAcacia")->setDescriptionId(IDS_TILE_STAIRS_ACACIAWOOD)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
Tile::woodStairsDark = (new StairTile(164, Tile::wood, TreeTile::DARK_TRUNK))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_darkwood)->setIconName(L"stairsWoodDark")->setDescriptionId(IDS_TILE_STAIRS_DARKWOOD)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
@ -518,10 +519,11 @@ void Tile::staticCtor()
Tile::clayHardened = (new Tile(172, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay, Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay")->setDescriptionId(IDS_TILE_HARDENED_CLAY)->setUseDescriptionId(IDS_DESC_HARDENED_CLAY);
Tile::coalBlock = (new Tile(173, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_coal)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"coal_block")->setDescriptionId(IDS_TILE_COAL)->setUseDescriptionId(IDS_DESC_COAL_BLOCK);
Tile::packed_ice = (new PackedIceTile(174))->setDestroyTime(0.5f)->setSoundType(SOUND_GLASS)->setIconName(L"packed_ice")->setDescriptionId(IDS_TILE_ICE)->setUseDescriptionId(IDS_DESC_ICE);
//
Tile::packed_ice = (new PackedIceTile(174))->setDestroyTime(0.5f)->setSoundType(SOUND_GLASS)->setIconName(L"packed_ice")->setDescriptionId(IDS_TILE_PACKED_ICE)->setUseDescriptionId(IDS_DESC_PACKED_ICE);
Tile::invertedDaylightDetector = static_cast<DaylightDetectorTile*>((new DaylightDetectorTile(178, true))->setDestroyTime(0.2f)->setSoundType(SOUND_WOOD)->setIconName(L"daylight_detector")->setDescriptionId(IDS_TILE_DAYLIGHT_DETECTOR)->setUseDescriptionId(IDS_DESC_DAYLIGHT_DETECTOR));
Tile::red_sandstone = (new RedSandStoneTile(179))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_sand)->setSoundType(Tile::SOUND_STONE)->setDestroyTime(0.8f)->sendTileData()->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_SANDSTONE)->sendTileData();
Tile::red_sandstone = (new RedSandStoneTile(179))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_sand)->setSoundType(Tile::SOUND_STONE)->setDestroyTime(0.8f)->sendTileData()->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_RED_SANDSTONE)->setUseDescriptionId(IDS_DESC_RED_SANDSTONE)->sendTileData();
Tile::stairs_red_sandstone = (new StairTile(180, Tile::red_sandstone, 0))->setBaseItemTypeAndMaterial(Item::eBaseItemType_stairs, Item::eMaterial_sand)->setIconName(L"stairsRedSandstone")->setDescriptionId(IDS_TILE_STAIRS_RED_SANDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_STAIRS);
Tile::spruceGate = (new FenceGateTile(183))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fenceGate, Item::eMaterial_sprucewood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(SOUND_WOOD)->setIconName(L"planks_spruce")->setDescriptionId(IDS_TILE_SPRUCE_GATE)->sendTileData()->setUseDescriptionId(IDS_DESC_FENCE_GATE);
@ -536,10 +538,10 @@ void Tile::staticCtor()
Tile::darkFence = (new FenceTile(191, L"planks_dark", Material::wood))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_darkwood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_DARK_FENCE)->setUseDescriptionId(IDS_DESC_FENCE);
Tile::acaciaFence = (new FenceTile(192, L"planks_acacia", Material::wood))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_acaciawood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_ACACIA_FENCE)->setUseDescriptionId(IDS_DESC_FENCE);
Tile::seaLantern = (new SeaLanternTile(169, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_GLOWSTONE);
Tile::prismarine = (new PrismarineTile(168))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"prismarine")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_ITEM_PRISMARINE_DESC);
Tile::seaLantern = (new SeaLanternTile(169, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_SEA_LANTERN);
Tile::prismarine = (new PrismarineTile(168))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"prismarine")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_DESC_PRISMARINE);
Tile::tallgrass2 = static_cast<TallGrass2*>((new TallGrass2(175))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass2_tall_grass_upper")->setDescriptionId(IDS_TILE_TALL_GRASS2)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap()->sendTileData(0xFF));
Tile::tallgrass2 = static_cast<TallGrass2*>((new TallGrass2(175))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"tallgrass2_tall_grass_upper")->setDescriptionId(IDS_DESC_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS)->disableMipmap()->sendTileData(0xFF));
// Special cases for certain items since they can have different icons
Item::items[wool_Id] = ( new WoolTileItem(Tile::wool_Id- 256) )->setIconName(L"cloth")->setDescriptionId(IDS_TILE_CLOTH)->setUseDescriptionId(IDS_DESC_WOOL);
@ -578,9 +580,16 @@ void Tile::staticCtor()
Item::items[red_sandstone_Id] = (new MultiTextureTileItem(Tile::red_sandstone_Id - 256, red_sandstone, (int*)RedSandStoneTile::SANDSTONE_NAMES, RedSandStoneTile::SANDSTONE_BLOCK_NAMES))->setIconName(L"red_sandstone")->setDescriptionId(IDS_TILE_SANDSTONE)->setUseDescriptionId(IDS_DESC_SANDSTONE);
Item::items[tree2Trunk_Id] = (new MultiTextureTileItem(Tile::tree2Trunk_Id - 256, tree2Trunk, (int*)TreeTile2::TREE_NAMES, TreeTile2::TREE_NAMES_LENGTH))->setIconName(L"log")->setDescriptionId(IDS_TILE_LOG)->setUseDescriptionId(IDS_DESC_LOG);
Item::items[sponge_Id] = (new MultiTextureTileItem(Tile::sponge_Id - 256, sponge, (int*)Sponge::SPONGE_NAMES, Sponge::SPONGE_NAMES_LENGTH))->setIconName(L"sponge")->setDescriptionId(IDS_TILE_SPONGE)->setUseDescriptionId(IDS_DESC_SPONGE);
int tallgrass2IdsData[5] = { IDS_TILE_TALL_GRASS2, IDS_TILE_LARGE_FERN, IDS_TILE_LILAC, IDS_TILE_ROSE_BUSH, IDS_TILE_PEONY };
int tallgrass2IdsData[TallGrass2::VARIANT_COUNT] = {
IDS_TILE_SUNFLOWER, // 0 - Sunflower, not implemented yet
IDS_TILE_LILAC, // 1 - Lilac
IDS_TILE_DOUBLE_TALL_GRASS, // 2 - Tall Grass
IDS_TILE_LARGE_FERN, // 3 - Large Fern
IDS_TILE_ROSE_BUSH, // 4 - Rose Bush
IDS_TILE_PEONY, // 5 - Peony
};
intArray tallgrass2Ids = intArray(tallgrass2IdsData, 5);
Item::items[tallgrass2_Id] = static_cast<TallGrass2TileItem*>((new TallGrass2TileItem(Tile::tallgrass2_Id - 256))->setDescriptionId(IDS_TILE_TALL_GRASS2)->setUseDescriptionId(IDS_DESC_TALL_GRASS))->setDescriptionPostfixes(tallgrass2Ids);
Item::items[tallgrass2_Id] = static_cast<TallGrass2TileItem*>((new TallGrass2TileItem(Tile::tallgrass2_Id - 256))->setDescriptionId(IDS_TILE_DOUBLE_TALL_GRASS)->setUseDescriptionId(IDS_DESC_TALL_GRASS))->setDescriptionPostfixes(tallgrass2Ids);
for (int i = 0; i < 256; i++)
{

8
Minecraft.World/TreeTile2.cpp
View file

@ -51,14 +51,6 @@ void TreeTile2::onRemove(Level* level, int x, int y, int z, int id, int data)
}
}
unsigned int TreeTile2::getDescriptionId(int iData /*= -1*/)
{
int type = iData & MASK_TYPE;
if (type < 0 || type >= TreeTile2::TREE_NAMES_LENGTH) type = 0;
return TreeTile2::TREE_NAMES[type];
}
Icon* TreeTile2::getTypeTexture(int type)
{
return icons_side[type];

1
Minecraft.World/TreeTile2.h
View file

@ -39,7 +39,6 @@ public:
virtual int getResourceCount(Random* random);
virtual int getResource(int data, Random* random, int playerBonusLevel);
virtual void onRemove(Level* level, int x, int y, int z, int id, int data);
virtual unsigned int getDescriptionId(int iData = -1);
protected:
virtual Icon* getTypeTexture(int type);

9
Minecraft.World/WoodSlabTile.cpp
View file

@ -50,13 +50,4 @@ int WoodSlabTile::getAuxName(int auxValue)
void WoodSlabTile::registerIcons(IconRegister *iconRegister)
{
// None
}
unsigned int WoodSlabTile::getDescriptionId(int iData)
{
if (iData < 0 || iData >= SLAB_NAMES_LENGTH)
{
iData = 0;
}
return SLAB_NAMES[iData];
}

3
Minecraft.World/WoodSlabTile.h
View file

@ -22,7 +22,4 @@ public:
virtual shared_ptr<ItemInstance> getSilkTouchItemInstance(int data);
void registerIcons(IconRegister *iconRegister);
// 4J added
virtual unsigned int getDescriptionId(int iData = -1);
};