Remove Stained Glass, Sword of Debug & Updated PORTING.md
Remove stained glass as its not accurate to TU19 up to TU24, Update PORTING.md to include versions we are trying to achieve & Remove the sword of debug as it was a debug item thats not needed.
This commit is contained in:
@@ -210,40 +210,6 @@ void IUIScene_CreativeMenu::staticCtor()
|
||||
ITEM_AUX(Tile::woolCarpet_Id,13) // Green
|
||||
ITEM_AUX(Tile::woolCarpet_Id,12) // Brown
|
||||
|
||||
ITEM_AUX(Tile::stained_glass_Id,14) // Red
|
||||
ITEM_AUX(Tile::stained_glass_Id,1) // Orange
|
||||
ITEM_AUX(Tile::stained_glass_Id,4) // Yellow
|
||||
ITEM_AUX(Tile::stained_glass_Id,5) // Lime
|
||||
ITEM_AUX(Tile::stained_glass_Id,3) // Light Blue
|
||||
ITEM_AUX(Tile::stained_glass_Id,9) // Cyan
|
||||
ITEM_AUX(Tile::stained_glass_Id,11) // Blue
|
||||
ITEM_AUX(Tile::stained_glass_Id,10) // Purple
|
||||
ITEM_AUX(Tile::stained_glass_Id,2) // Magenta
|
||||
ITEM_AUX(Tile::stained_glass_Id,6) // Pink
|
||||
ITEM_AUX(Tile::stained_glass_Id,0) // White
|
||||
ITEM_AUX(Tile::stained_glass_Id,8) // Light Gray
|
||||
ITEM_AUX(Tile::stained_glass_Id,7) // Gray
|
||||
ITEM_AUX(Tile::stained_glass_Id,15) // Black
|
||||
ITEM_AUX(Tile::stained_glass_Id,13) // Green
|
||||
ITEM_AUX(Tile::stained_glass_Id,12) // Brown
|
||||
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,14) // Red
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,1) // Orange
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,4) // Yellow
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,5) // Lime
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,3) // Light Blue
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,9) // Cyan
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,11) // Blue
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,10) // Purple
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,2) // Magenta
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,6) // Pink
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,0) // White
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,8) // Light Gray
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,7) // Gray
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,15) // Black
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,13) // Green
|
||||
ITEM_AUX(Tile::stained_glass_pane_Id,12) // Brown
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
DEF(eCreativeInventory_ArtToolsDecorations)
|
||||
if(app.DebugSettingsOn())
|
||||
@@ -492,16 +458,6 @@ void IUIScene_CreativeMenu::staticCtor()
|
||||
list->push_back(Item::enchantedBook->createForEnchantment(new EnchantmentInstance(enchantment, enchantment->getMaxLevel())));
|
||||
}
|
||||
|
||||
#ifndef _CONTENT_PACKAGE
|
||||
if(app.DebugSettingsOn())
|
||||
{
|
||||
shared_ptr<ItemInstance> debugSword = std::make_shared<ItemInstance>(Item::sword_diamond_Id, 1, 0);
|
||||
debugSword->enchant( Enchantment::damageBonus, 50 );
|
||||
debugSword->setHoverName(L"Sword of Debug");
|
||||
list->push_back(debugSword);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Materials
|
||||
DEF(eCreativeInventory_Materials)
|
||||
ITEM(Item::coal_Id)
|
||||
|
||||
@@ -3241,7 +3241,6 @@ bool TileRenderer::tesselateThinPaneInWorld(Tile *tt, int x, int y, int z)
|
||||
Icon *tex;
|
||||
Icon *edgeTex;
|
||||
|
||||
bool stained = dynamic_cast<StainedGlassPaneBlock *>(tt) != nullptr;
|
||||
if (hasFixedTexture())
|
||||
{
|
||||
tex = fixedTexture;
|
||||
@@ -3251,7 +3250,7 @@ bool TileRenderer::tesselateThinPaneInWorld(Tile *tt, int x, int y, int z)
|
||||
{
|
||||
int data = level->getData(x, y, z);
|
||||
tex = getTexture(tt, 0, data);
|
||||
edgeTex = (stained) ? static_cast<StainedGlassPaneBlock *>(tt)->getEdgeTexture(data) : static_cast<ThinFenceTile *>(tt)->getEdgeTexture();
|
||||
edgeTex = static_cast<ThinFenceTile *>(tt)->getEdgeTexture();
|
||||
}
|
||||
|
||||
double u0 = tex->getU0();
|
||||
@@ -3277,10 +3276,10 @@ bool TileRenderer::tesselateThinPaneInWorld(Tile *tt, int x, int y, int z)
|
||||
double iz0 = z + .5 - 1.0 / 16.0;
|
||||
double iz1 = z + .5 + 1.0 / 16.0;
|
||||
|
||||
bool n = (stained) ? static_cast<StainedGlassPaneBlock *>(tt)->attachsTo(level->getTile(x, y, z - 1)) : static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x, y, z - 1));
|
||||
bool s = (stained) ? static_cast<StainedGlassPaneBlock *>(tt)->attachsTo(level->getTile(x, y, z + 1)) : static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x, y, z + 1));
|
||||
bool w = (stained) ? static_cast<StainedGlassPaneBlock *>(tt)->attachsTo(level->getTile(x - 1, y, z)) : static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x - 1, y, z));
|
||||
bool e = (stained) ? static_cast<StainedGlassPaneBlock *>(tt)->attachsTo(level->getTile(x + 1, y, z)) : static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x + 1, y, z));
|
||||
bool n = static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x, y, z - 1));
|
||||
bool s = static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x, y, z + 1));
|
||||
bool w = static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x - 1, y, z));
|
||||
bool e = static_cast<ThinFenceTile *>(tt)->attachsTo(level->getTile(x + 1, y, z));
|
||||
|
||||
double noZFightingOffset = 0.001;
|
||||
double yt = 1.0 - noZFightingOffset;
|
||||
|
||||
Reference in New Issue
Block a user