backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-06-21 10:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Prismarine Block

Browse source 
Will add the next blocks, pushing for consistency
This commit is contained in:
Tranqlmao 2026-03-18 16:39:35 -04:00
parent 1822ffd3b0
commit c6669c696f
14 changed files with 489 additions and 2 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.

1
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View file

@ -76,6 +76,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::tree2Trunk_Id, TreeTile2::ACACIA_TRUNK)
ITEM_AUX(Tile::tree2Trunk_Id, TreeTile2::DARK_TRUNK)
ITEM(Tile::seaLantern_Id)
ITEM(Tile::prismarine_Id)
ITEM(Tile::gravel_Id)
ITEM(Tile::redBrick_Id)
ITEM(Tile::mossyCobblestone_Id)

BIN
Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/prismarine_rough.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 198 KiB

440
Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/prismarine_rough.txt Normal file
View file

@ -0,0 +1,440 @@
0*15
1*15
2*15
3*15
4*15
5*15
6*15
7*15
8*15
9*15
10*15
11*15
12*15
13*15
14*15
15*15
16*15
17*15
18*15
19*15
20*15
21*15
22*15
23*15
24*15
25*15
26*15
27*15
28*15
29*15
30*15
31*15
32*15
33*15
34*15
35*15
36*15
37*15
38*15
39*15
40*15
41*15
42*15
43*15
44*15
45*15
46*15
47*15
48*15
49*15
50*15
51*15
52*15
53*15
54*15
55*15
56*15
57*15
58*15
59*15
60*15
61*15
62*15
63*15
64*15
65*15
66*15
67*15
68*15
69*15
70*15
71*15
72*15
73*15
74*15
75*15
76*15
77*15
78*15
79*15
80*15
81*15
82*15
83*15
84*15
85*15
86*15
87*15
88*15
89*15
90*15
91*15
92*15
93*15
94*15
95*15
96*15
97*15
98*15
99*15
100*15
101*15
102*15
103*15
104*15
105*15
106*15
107*15
108*15
109*15
110*15
111*15
112*15
113*15
114*15
115*15
116*15
117*15
118*15
119*15
120*15
121*15
122*15
123*15
124*15
125*15
126*15
127*15
128*15
129*15
130*15
131*15
132*15
133*15
134*15
135*15
136*15
137*15
138*15
139*15
140*15
141*15
142*15
143*15
144*15
145*15
146*15
147*15
148*15
149*15
150*15
151*15
152*15
153*15
154*15
155*15
156*15
157*15
158*15
159*15
160*15
161*15
162*15
163*15
164*15
165*15
166*15
167*15
168*15
169*15
170*15
171*15
172*15
173*15
174*15
175*15
176*15
177*15
178*15
179*15
180*15
181*15
182*15
183*15
184*15
185*15
186*15
187*15
188*15
189*15
190*15
191*15
192*15
193*15
194*15
195*15
196*15
197*15
198*15
199*15
200*15
201*15
202*15
203*15
204*15
205*15
206*15
207*15
208*15
209*15
210*15
211*15
212*15
213*15
214*15
215*15
216*15
217*15
218*15
219*15
220*15
221*15
222*15
223*15
224*15
225*15
226*15
227*15
228*15
229*15
230*15
231*15
232*15
233*15
234*15
235*15
236*15
237*15
238*15
239*15
240*15
241*15
242*15
243*15
244*15
245*15
246*15
247*15
248*15
249*15
250*15
251*15
252*15
253*15
254*15
255*15
256*15
257*15
258*15
259*15
260*15
261*15
262*15
263*15
264*15
265*15
266*15
267*15
268*15
269*15
270*15
271*15
272*15
273*15
274*15
275*15
276*15
277*15
278*15
279*15
280*15
281*15
282*15
283*15
284*15
285*15
286*15
287*15
288*15
289*15
290*15
291*15
292*15
293*15
294*15
295*15
296*15
297*15
298*15
299*15
300*15
301*15
302*15
303*15
304*15
305*15
306*15
307*15
308*15
309*15
310*15
311*15
312*15
313*15
314*15
315*15
316*15
317*15
318*15
319*15
320*15
321*15
322*15
323*15
324*15
325*15
326*15
327*15
328*15
329*15
330*15
331*15
332*15
333*15
334*15
335*15
336*15
337*15
338*15
339*15
340*15
341*15
342*15
343*15
344*15
345*15
346*15
347*15
348*15
349*15
350*15
351*15
352*15
353*15
354*15
355*15
356*15
357*15
358*15
359*15
360*15
361*15
362*15
363*15
364*15
365*15
366*15
367*15
368*15
369*15
370*15
371*15
372*15
373*15
374*15
375*15
376*15
377*15
378*15
379*15
380*15
381*15
382*15
383*15
384*15
385*15
386*15
387*15
388*15
389*15
390*15
391*15
392*15
393*15
394*15
395*15
396*15
397*15
398*15
399*15
400*15
401*15
402*15
403*15
404*15
405*15
406*15
407*15
408*15
409*15
410*15
411*15
412*15
413*15
414*15
415*15
416*15
417*15
418*15
419*15
420*15
421*15
422*15
423*15
424*15
425*15
426*15
427*15
428*15
429*15
430*15
431*15
432*15
433*15
434*15
435*15
436*15
437*15
438*15
439*15

3
Minecraft.Client/PreStitchedTextureMap.cpp
View file

@ -1040,6 +1040,9 @@ void PreStitchedTextureMap::loadUVs()
ADD_ICON(23, 3, L"door_jungle_upper");
ADD_ICON(23, 4, L"door_spruce_upper");
ADD_ICON(23, 13, L"sea_lantern");
ADD_ICON(22, 13, L"prismarine_rough");
ADD_ICON(21, 13, L"prismarine_dark");
ADD_ICON(20, 13, L"prismarine_bricks");
ADD_ICON(23, 12, L"packed_ice");
ADD_ICON(23, 14, L"inverted_daylight_detector");

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

@ -2342,3 +2342,6 @@
#define IDS_RICHPRESENCESTATE_BREWING 2336
#define IDS_RICHPRESENCESTATE_ANVIL 2337
#define IDS_RICHPRESENCESTATE_TRADING 2338
#define IDS_TILE_PRISMARINE 2339
#define IDS_TILE_PRISMARINE_DARK 2340
#define IDS_TILE_PRISMARINE_BRICKS 2341

2
Minecraft.World/Item.cpp
View file

@ -526,7 +526,7 @@ void Item::staticCtor()
Item::rabbits_foot = ( new Item(158) ) ->setIconName(L"rabbitsFoot")->setDescriptionId(IDS_ITEM_RABBIT_FOOT)->setUseDescriptionId(IDS_DESC_RABBIT_FOOT);
Item::armor_stand = (new ArmorStandItem(160)) ->setBaseItemTypeAndMaterial(eBaseItemType_HangingItem,eMaterial_cloth)->setIconName(L"armorStand")->setDescriptionId(IDS_ITEM_ARMOR_STAND)->setUseDescriptionId(IDS_DESC_ARMOR_STAND);
Item::prismarine_crystal = (new Item(161))->setIconName(L"prismarineCrystal")->setDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL)->setUseDescriptionId(IDS_DESC_BRICK);
Item::prismarine_crystal = (new Item(176))->setIconName(L"prismarineCrystal")->setDescriptionId(IDS_ITEM_PRISMARINE_CRYSTAL)->setUseDescriptionId(IDS_DESC_BRICK);
}

2
Minecraft.World/Item.h
View file

@ -659,7 +659,7 @@ public:
static const int rabbit_hide_Id = 415;
static const int armor_stand_Id = 416;
static const int prismarine_cystal_Id = 417;
static const int prismarine_cystal_Id = 432;
public:
const int id;

2
Minecraft.World/Minecraft.World.vcxproj
View file

@ -2710,6 +2710,7 @@
<ClInclude Include="PoweredMetalTile.h" />
<ClInclude Include="PoweredRailTile.h" />
<ClInclude Include="AbstractProjectileDispenseBehavior.h" />
<ClInclude Include="PrismarineTile.h" />
<ClInclude Include="Rabbit.h" />
<ClInclude Include="RailTile.h" />
<ClInclude Include="RedSandStoneTile.h" />
@ -3650,6 +3651,7 @@
<ClCompile Include="PoweredMetalTile.cpp" />
<ClCompile Include="PoweredRailTile.cpp" />
<ClCompile Include="AbstractProjectileDispenseBehavior.cpp" />
<ClCompile Include="PrismarineTile.cpp" />
<ClCompile Include="Rabbit.cpp" />
<ClCompile Include="RailTile.cpp" />
<ClCompile Include="RedSandStoneTile.cpp" />

2
Minecraft.World/Minecraft.World.vcxproj.filters
View file

@ -826,6 +826,7 @@
<ClCompile Include="DarkOakFeature.cpp" />
<ClCompile Include="SavannaBiome.cpp" />
<ClCompile Include="RoofedForestBiome.cpp" />
<ClCompile Include="PrismarineTile.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AABB.h" />
@ -1821,6 +1822,7 @@
<ClInclude Include="DarkOakFeature.h" />
<ClInclude Include="SavannaBiome.h" />
<ClInclude Include="RoofedForestBiome.h" />
<ClInclude Include="PrismarineTile.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\Minecraft.Client\Xbox\res\audio\Minecraft.xgs" />

18
Minecraft.World/PrismarineTile.cpp Normal file
View file

@ -0,0 +1,18 @@
#include "stdafx.h"
#include "PrismarineTile.h"
#include "net.minecraft.world.item.h"
#include "IconRegister.h"
PrismarineTile::PrismarineTile(int id, Material* material) : Tile(id, material)
{
}
void PrismarineTile::registerIcons(IconRegister* iconRegister)
{
icon = iconRegister->registerIcon(L"prismarine_rough");
}
Icon* PrismarineTile::getTexture(int face, int data)
{
return icon;
}

12
Minecraft.World/PrismarineTile.h Normal file
View file

@ -0,0 +1,12 @@
#pragma once
#include "Tile.h"
class PrismarineTile : public Tile
{
public:
PrismarineTile(int id, Material* material);
virtual void registerIcons(IconRegister* iconRegister);
virtual Icon* getTexture(int face, int data);
private:
Icon* icon;
};

3
Minecraft.World/Tile.cpp
View file

@ -16,6 +16,7 @@
#include "net.minecraft.world.h"
#include "net.minecraft.h"
#include "Tile.h"
#include "PrismarineTile.h"
wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile.";
@ -250,6 +251,7 @@ Tile* Tile::invertedDaylightDetector = nullptr;
Tile* Tile::red_sandstone = nullptr;
Tile* Tile::stairs_red_sandstone = nullptr;
Tile* Tile::seaLantern = nullptr;
Tile* Tile::prismarine = nullptr;
Tile* Tile::tree2Trunk = nullptr;
Tile* Tile::packed_ice = nullptr;
@ -507,6 +509,7 @@ void Tile::staticCtor()
Tile::door_dark = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_dark")->setDescriptionId(IDS_TILE_DOOR_DARK)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD);
Tile::seaLantern = (new SeaLanternTile(198, 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(200, Material::stone))->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(Tile::SOUND_STONE)->setIconName(L"stone")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_DESC_STONE);
// Special cases for certain items since they can have different icons

3
Minecraft.World/Tile.h
View file

@ -396,6 +396,7 @@ public:
static const int acaciaFence_Id = 192;
static const int seaLantern_Id = 198;
static const int prismarine_Id = 200;
static Tile *stone;
static GrassTile *grass;
@ -602,6 +603,8 @@ public:
static Tile* tree2Trunk;
static Tile* packed_ice;
static Tile* seaLantern;
static Tile* prismarine;
static Tile* prismarinedark;
static void staticCtor();