mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-03 01:34:22 +00:00
chore: format Minecraft.World
This commit is contained in:
@@ -8,57 +8,49 @@
|
||||
|
||||
#include "MusicTileEntity.h"
|
||||
|
||||
|
||||
|
||||
MusicTileEntity::MusicTileEntity() : TileEntity()
|
||||
{
|
||||
MusicTileEntity::MusicTileEntity() : TileEntity() {
|
||||
note = 0;
|
||||
|
||||
on = false;
|
||||
|
||||
on = false;
|
||||
}
|
||||
|
||||
void MusicTileEntity::save(CompoundTag *tag)
|
||||
{
|
||||
TileEntity::save(tag);
|
||||
tag->putByte(L"note", note);
|
||||
void MusicTileEntity::save(CompoundTag* tag) {
|
||||
TileEntity::save(tag);
|
||||
tag->putByte(L"note", note);
|
||||
}
|
||||
|
||||
void MusicTileEntity::load(CompoundTag *tag)
|
||||
{
|
||||
TileEntity::load(tag);
|
||||
note = tag->getByte(L"note");
|
||||
if (note < 0) note = 0;
|
||||
if (note > 24) note = 24;
|
||||
void MusicTileEntity::load(CompoundTag* tag) {
|
||||
TileEntity::load(tag);
|
||||
note = tag->getByte(L"note");
|
||||
if (note < 0) note = 0;
|
||||
if (note > 24) note = 24;
|
||||
}
|
||||
|
||||
void MusicTileEntity::tune()
|
||||
{
|
||||
note = (uint8_t) ((note + 1) % 25);
|
||||
setChanged();
|
||||
void MusicTileEntity::tune() {
|
||||
note = (uint8_t)((note + 1) % 25);
|
||||
setChanged();
|
||||
}
|
||||
|
||||
void MusicTileEntity::playNote(Level *level, int x, int y, int z)
|
||||
{
|
||||
if (level->getMaterial(x, y + 1, z) != Material::air) return;
|
||||
void MusicTileEntity::playNote(Level* level, int x, int y, int z) {
|
||||
if (level->getMaterial(x, y + 1, z) != Material::air) return;
|
||||
|
||||
Material *m = level->getMaterial(x, y - 1, z);
|
||||
Material* m = level->getMaterial(x, y - 1, z);
|
||||
|
||||
int i = 0;
|
||||
if (m == Material::stone) i = 1;
|
||||
if (m == Material::sand) i = 2;
|
||||
if (m == Material::glass) i = 3;
|
||||
if (m == Material::wood) i = 4;
|
||||
int i = 0;
|
||||
if (m == Material::stone) i = 1;
|
||||
if (m == Material::sand) i = 2;
|
||||
if (m == Material::glass) i = 3;
|
||||
if (m == Material::wood) i = 4;
|
||||
|
||||
level->tileEvent(x, y, z, Tile::musicBlock_Id, i, note);
|
||||
level->tileEvent(x, y, z, Tile::musicBlock_Id, i, note);
|
||||
}
|
||||
|
||||
// 4J Added
|
||||
std::shared_ptr<TileEntity> MusicTileEntity::clone()
|
||||
{
|
||||
std::shared_ptr<MusicTileEntity> result = std::shared_ptr<MusicTileEntity>( new MusicTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
std::shared_ptr<TileEntity> MusicTileEntity::clone() {
|
||||
std::shared_ptr<MusicTileEntity> result =
|
||||
std::shared_ptr<MusicTileEntity>(new MusicTileEntity());
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->note = note;
|
||||
return result;
|
||||
result->note = note;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user