str1k3r/MCLEClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Begin Hay Bale Removal

Browse Source
This commit is contained in:
str1k3r
2026-05-13 18:47:17 -04:00
parent 790d257725
commit 415dcdf7b7
16 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Tutorial/Tutorial.cpp
-4
View File
@@ -332,7 +332,6 @@ void Tutorial::staticCtor()
s_completableTasks.push_back( e_Tutorial_Hint_Hopper );
s_completableTasks.push_back( e_Tutorial_Hint_Comparator );
s_completableTasks.push_back( e_Tutorial_Hint_ChestTrap );
s_completableTasks.push_back( e_Tutorial_Hint_HayBlock );
s_completableTasks.push_back( e_Tutorial_Hint_ClayHardened );
s_completableTasks.push_back( e_Tutorial_Hint_ClayHardenedColored );
s_completableTasks.push_back( e_Tutorial_Hint_CoalBlock );
@@ -785,9 +784,6 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
int trappedChestItems[] = {Tile::chest_trap_Id};
if(!isHintCompleted(e_Tutorial_Hint_ChestTrap)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_ChestTrap, this, trappedChestItems, 1 ) );
int hayBlockItems[] = {Tile::hayBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_HayBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_HayBlock, this, hayBlockItems, 1 ) );
int coalBlockItems[] = {Tile::coalBlock_Id};
if(!isHintCompleted(e_Tutorial_Hint_CoalBlock)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_CoalBlock, this, coalBlockItems, 1 ) );
Minecraft.Client/Common/Tutorial/TutorialEnum.h
-1
View File
@@ -309,7 +309,6 @@ enum eTutorial_Hint
e_Tutorial_Hint_Hopper,
e_Tutorial_Hint_Comparator,
e_Tutorial_Hint_ChestTrap,
e_Tutorial_Hint_HayBlock,
e_Tutorial_Hint_ClayHardened,
e_Tutorial_Hint_ClayHardenedColored,
e_Tutorial_Hint_CoalBlock,
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
-1
View File
@@ -157,7 +157,6 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::sign_Id)
ITEM(Tile::bookshelf_Id)
ITEM(Item::flowerPot_Id)
ITEM(Tile::hayBlock_Id)
ITEM_AUX(Tile::wool_Id,14) // Red
ITEM_AUX(Tile::wool_Id,1) // Orange
ITEM_AUX(Tile::wool_Id,4) // Yellow
Minecraft.Client/Minecraft.cpp
-1
View File
@@ -3404,7 +3404,6 @@ void Minecraft::tick(bool bFirst, bool bUpdateTextures)
case Item::wheat_Id:
case Item::sugar_Id:
case Item::bread_Id:
case Tile::hayBlock_Id:
case Item::apple_Id:
heldItemIsFood = true;
break;
Minecraft.Client/PS3/PS3Extras/boost_1_53_0/boost/typeof/vector150.hpp
+1 -1
View File
File diff suppressed because one or more lines are too long
Minecraft.Client/PSVitaMedia/strings.h
-2
View File
@@ -405,7 +405,6 @@
#define IDS_DESC_HALFSLAB 403
#define IDS_DESC_HARDENED_CLAY 404
#define IDS_DESC_HATCHET 405
#define IDS_DESC_HAY 406
#define IDS_DESC_HELL_ROCK 407
#define IDS_DESC_HELL_SAND 408
#define IDS_DESC_HELMET 409
@@ -1554,7 +1553,6 @@
#define IDS_TILE_GRASS 1552
#define IDS_TILE_GRAVEL 1553
#define IDS_TILE_HARDENED_CLAY 1554
#define IDS_TILE_HAY 1555
#define IDS_TILE_HELL_ROCK 1556
#define IDS_TILE_HELL_SAND 1557
#define IDS_TILE_HOPPER 1558
Minecraft.Client/Windows64Media/strings.h
-2
View File
@@ -463,7 +463,6 @@
#define IDS_DESC_ACTIVATOR_RAIL 457
#define IDS_DESC_DROPPER 458
#define IDS_DESC_STAINED_CLAY 459
#define IDS_DESC_HAY 460
#define IDS_DESC_HARDENED_CLAY 461
#define IDS_DESC_STAINED_GLASS 462
#define IDS_DESC_STAINED_GLASS_PANE 463
@@ -954,7 +953,6 @@
#define IDS_TILE_ACTIVATOR_RAIL 948
#define IDS_TILE_DROPPER 949
#define IDS_TILE_STAINED_CLAY 950
#define IDS_TILE_HAY 951
#define IDS_TILE_HARDENED_CLAY 952
#define IDS_TILE_COAL 953
#define IDS_TILE_STAINED_CLAY_BLACK 954
Minecraft.World/EntityHorse.cpp
-5
View File
@@ -897,11 +897,6 @@ bool EntityHorse::mobInteract(shared_ptr<Player> player)
_ageUp = 180;
temper = 3;
}
else if (itemstack->id == Tile::hayBlock_Id)
{
_heal = 20;
_ageUp = 180;
}
else if (itemstack->id == Item::apple_Id)
{
_heal = 3;
Minecraft.World/FireTile.cpp
-1
View File
@@ -53,7 +53,6 @@ void FireTile::init()
setFlammable(Tile::wool_Id, FLAME_EASY, BURN_EASY);
setFlammable(Tile::vine_Id, FLAME_MEDIUM, BURN_INSTANT);
setFlammable(Tile::coalBlock_Id, FLAME_HARD, BURN_HARD);
setFlammable(Tile::hayBlock_Id, FLAME_INSTANT, BURN_MEDIUM);
}
void FireTile::setFlammable(int id, int flame, int burn)
Minecraft.World/HayBlockTile.cpp
-23
View File
@@ -1,23 +0,0 @@
#include "stdafx.h"
#include "net.minecraft.world.h"
#include "HayBlockTile.h"
HayBlockTile::HayBlockTile(int id) : RotatedPillarTile(id, Material::grass)
{
}
int HayBlockTile::getRenderShape()
{
return SHAPE_TREE;
}
Icon *HayBlockTile::getTypeTexture(int type)
{
return icon;
}
void HayBlockTile::registerIcons(IconRegister *iconRegister)
{
iconTop = iconRegister->registerIcon(getIconName() + L"_top");
icon = iconRegister->registerIcon(getIconName() + L"_side");
}
Minecraft.World/HayBlockTile.h
-18
View File
@@ -1,18 +0,0 @@
#pragma once
#include "RotatedPillarTile.h"
class HayBlockTile : public RotatedPillarTile
{
friend class ChunkRebuildData;
public:
HayBlockTile(int id);
int getRenderShape();
protected:
Icon *getTypeTexture(int type);
public:
void registerIcons(IconRegister *iconRegister);
};
Minecraft.World/OreRecipies.cpp
-1
View File
@@ -29,7 +29,6 @@ void OreRecipies::_init()
ADD_OBJECT(map[6],Tile::coalBlock);
ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
ADD_OBJECT(map[7],Tile::hayBlock);
ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
}
void OreRecipies::addRecipes(Recipes *r)
Minecraft.World/Tile.cpp
+4 -2
View File
@@ -212,7 +212,6 @@ Tile *Tile::stairs_quartz = nullptr;
Tile *Tile::activatorRail = nullptr;
Tile *Tile::dropper = nullptr;
Tile *Tile::hayBlock = nullptr;
Tile *Tile::woolCarpet = nullptr;
Tile *Tile::coalBlock = nullptr;
@@ -435,7 +434,7 @@ void Tile::staticCtor()
Tile::activatorRail = (new PoweredRailTile(157)) ->setDestroyTime(0.7f)->setSoundType(SOUND_METAL)->setIconName(L"rail_activator")->setDescriptionId(IDS_TILE_ACTIVATOR_RAIL)->setUseDescriptionId(IDS_DESC_ACTIVATOR_RAIL);
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::hayBlock = (new HayBlockTile(170)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_wheat)->setDestroyTime(0.5f)->setSoundType(SOUND_GRASS)->setIconName(L"hay_block")->setDescriptionId(IDS_TILE_HAY)->setUseDescriptionId(IDS_DESC_HAY);
(new Tile(170, Material::stone))->setDestroyTime(0.0f)->setNotCollectStatistics();
Tile::woolCarpet = (new WoolCarpetTile(171)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_carpet, Item::eMaterial_cloth)->setDestroyTime(0.1f)->setSoundType(SOUND_CLOTH)->setIconName(L"woolCarpet")->setLightBlock(0)->setDescriptionId(IDS_TILE_CARPET)->setUseDescriptionId(IDS_DESC_CARPET);
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);
@@ -1507,6 +1506,9 @@ Tile::SoundType::SoundType(eMATERIALSOUND_TYPE eMaterialSound, float volume, flo
case eMaterialSoundType_LADDER:
this->iStepSound=eSoundType_STEP_LADDER;
break;
case eMaterialSoundType_ANVIL:
this->iStepSound = eSoundType_STEP_STONE;
break;
default:
app.DebugPrintf("NO STEP SOUND!\n");
Minecraft.World/Tile.h
-2
View File
@@ -359,7 +359,6 @@ public:
static const int dropper_Id = 158;
static const int stained_glass_pane_Id = 160;
static const int hayBlock_Id = 170;
static const int woolCarpet_Id = 171;
static const int coalBlock_Id = 173;
@@ -533,7 +532,6 @@ public:
static Tile *dropper;
static Tile *stained_glass_pane;
static Tile *hayBlock;
static Tile *woolCarpet;
static Tile *coalBlock;
Minecraft.World/cmake/sources/Common.cmake
-2
View File
@@ -1803,8 +1803,6 @@ set(_MINECRAFT_WORLD_COMMON_NET_MINECRAFT_WORLD_LEVEL_TILE
"${CMAKE_CURRENT_SOURCE_DIR}/HalfSlabTile.h"
"${CMAKE_CURRENT_SOURCE_DIR}/HalfTransparentTile.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/HalfTransparentTile.h"
"${CMAKE_CURRENT_SOURCE_DIR}/HayBlockTile.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/HayBlockTile.h"
"${CMAKE_CURRENT_SOURCE_DIR}/HeavyTile.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/HeavyTile.h"
"${CMAKE_CURRENT_SOURCE_DIR}/HopperTile.cpp"
Minecraft.World/net.minecraft.world.level.tile.h
-1
View File
@@ -49,7 +49,6 @@
#include "GravelTile.h"
#include "HalfSlabTile.h"
#include "HalfTransparentTile.h"
#include "HayBlockTile.h"
#include "HeavyTile.h"
#include "HopperTile.h"
#include "HugeMushroomTile.h"