Added Rose Types + jeb_ Easter egg

This commit is contained in:
piebot
2026-03-14 00:51:31 +03:00
parent 2c6060c26e
commit 00d3ca7b9b
12 changed files with 246 additions and 10 deletions
@@ -210,7 +210,16 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::tallgrass_Id, TallGrass::FERN)
ITEM(Tile::deadBush_Id)
ITEM(Tile::flower_Id)
ITEM(Tile::rose_Id)
ITEM_AUX(Tile::rose_Id, 0)
ITEM_AUX(Tile::rose_Id, Rose::BLUE_ORCHID)
ITEM_AUX(Tile::rose_Id, Rose::ALLIUM)
ITEM_AUX(Tile::rose_Id, Rose::AZURE_BLUET)
ITEM_AUX(Tile::rose_Id, Rose::RED_TULIP)
ITEM_AUX(Tile::rose_Id, Rose::ORANGE_TULIP)
ITEM_AUX(Tile::rose_Id, Rose::WHITE_TULIP)
ITEM_AUX(Tile::rose_Id, Rose::PINK_TULIP)
ITEM_AUX(Tile::rose_Id, Rose::OXEYE_DAISY)
ITEM(Tile::mushroom_brown_Id)
ITEM(Tile::mushroom_red_Id)
ITEM(Tile::cactus_Id)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 KiB

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

+8 -8
View File
@@ -1018,13 +1018,13 @@ void PreStitchedTextureMap::loadUVs()
ADD_ICON(21, 9, L"stone_diorite");
ADD_ICON(21, 10, L"stone_diorite_smooth");
ADD_ICON(22, 1, L"flower_blue_orchid");
ADD_ICON(22, 2, L"flower_allium");
ADD_ICON(22, 3, L"flower_houstonia");
ADD_ICON(22, 4, L"flower_tulip_red");
ADD_ICON(22, 5, L"flower_tulip_orange");
ADD_ICON(22, 6, L"flower_tulip_white");
ADD_ICON(22, 7, L"flower_tulip_pink");
ADD_ICON(22, 8, L"flower_oxeye_daisy");
ADD_ICON(22, 0, L"flower_blue_orchid");
ADD_ICON(22, 1, L"flower_allium");
ADD_ICON(22, 2, L"flower_houstonia");
ADD_ICON(22, 3, L"flower_tulip_red");
ADD_ICON(22, 4, L"flower_tulip_orange");
ADD_ICON(22, 5, L"flower_tulip_white");
ADD_ICON(22, 6, L"flower_tulip_pink");
ADD_ICON(22, 7, L"flower_oxeye_daisy");
}
}
+16
View File
@@ -2,6 +2,7 @@
#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
#include "SheepFurModel.h"
#include "ModelPart.h"
#include "../Minecraft.World/Sheep.cpp"
SheepFurModel::SheepFurModel() : QuadrupedModel(12, 0)
{
@@ -48,6 +49,21 @@ void SheepFurModel::prepareMobModel(shared_ptr<LivingEntity> mob, float time, fl
shared_ptr<Sheep> sheep = dynamic_pointer_cast<Sheep>(mob);
head->y = 6 + sheep->getHeadEatPositionScale(a) * 9.0f;
headXRot = sheep->getHeadEatAngleScale(a);
wstring name = mob->getAName();
if (name == L"jeb_")
{
int i1 = 25;
int i = mob->tickCount / 25;
int j = Sheep::COLOR_LENGTH;
int k = i % j;
int l = (i + 1) % j;
float f = ((float)(mob->tickCount % 25) + time) / 25.0F;
const float* afloat1 = Sheep::COLOR[k];
const float* afloat2 = Sheep::COLOR[l];
RenderManager.StateSetColour(afloat1[0] * (1.0F - f) + afloat2[0] * f, afloat1[1] * (1.0F - f) + afloat2[1] * f, afloat1[2] * (1.0F - f) + afloat2[2] * f, 1.0f);
}
}
void SheepFurModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)