aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/NotGateTile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/NotGateTile.cpp')
-rw-r--r--Minecraft.World/NotGateTile.cpp216
1 files changed, 109 insertions, 107 deletions
diff --git a/Minecraft.World/NotGateTile.cpp b/Minecraft.World/NotGateTile.cpp
index a3971284..464e0ca5 100644
--- a/Minecraft.World/NotGateTile.cpp
+++ b/Minecraft.World/NotGateTile.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "net.minecraft.world.level.h"
+#include "net.minecraft.world.level.redstone.h"
#include "NotGateTile.h"
#include "SoundTypes.h"
#include "net.minecraft.world.h"
@@ -24,201 +25,209 @@ bool NotGateTile::isToggledTooFrequently(Level *level, int x, int y, int z, bool
{
recentToggles[level] = new deque<Toggle>;
}
- if (add) recentToggles[level]->push_back(Toggle(x, y, z, level->getTime()));
- int count = 0;
+ if (add) recentToggles[level]->push_back(Toggle(x, y, z, level->getGameTime()));
+ int count = 0;
AUTO_VAR(itEnd, recentToggles[level]->end());
for (AUTO_VAR(it, recentToggles[level]->begin()); it != itEnd; it++)
{
- if (it->x == x && it->y == y && it->z == z)
+ if (it->x == x && it->y == y && it->z == z)
{
- count++;
- if (count >= MAX_RECENT_TOGGLES)
+ count++;
+ if (count >= MAX_RECENT_TOGGLES)
{
- return true;
- }
- }
- }
- return false;
+ return true;
+ }
+ }
+ }
+ return false;
}
NotGateTile::NotGateTile(int id, bool on) : TorchTile(id)
{
- this->on = on;
- this->setTicking(true);
+ this->on = on;
+ this->setTicking(true);
}
-int NotGateTile::getTickDelay()
+int NotGateTile::getTickDelay(Level *level)
{
return 2;
}
void NotGateTile::onPlace(Level *level, int x, int y, int z)
{
- if (level->getData(x, y, z) == 0) TorchTile::onPlace(level, x, y, z);
- if (on)
+ if (level->getData(x, y, z) == 0) TorchTile::onPlace(level, x, y, z);
+ if (on)
{
- level->updateNeighborsAt(x, y - 1, z, id);
- level->updateNeighborsAt(x, y + 1, z, id);
- level->updateNeighborsAt(x - 1, y, z, id);
- level->updateNeighborsAt(x + 1, y, z, id);
- level->updateNeighborsAt(x, y, z - 1, id);
- level->updateNeighborsAt(x, y, z + 1, id);
- }
+ level->updateNeighborsAt(x, y - 1, z, id);
+ level->updateNeighborsAt(x, y + 1, z, id);
+ level->updateNeighborsAt(x - 1, y, z, id);
+ level->updateNeighborsAt(x + 1, y, z, id);
+ level->updateNeighborsAt(x, y, z - 1, id);
+ level->updateNeighborsAt(x, y, z + 1, id);
+ }
}
void NotGateTile::onRemove(Level *level, int x, int y, int z, int id, int data)
{
- if (on)
+ if (on)
{
- level->updateNeighborsAt(x, y - 1, z, this->id);
- level->updateNeighborsAt(x, y + 1, z, this->id);
- level->updateNeighborsAt(x - 1, y, z, this->id);
- level->updateNeighborsAt(x + 1, y, z, this->id);
- level->updateNeighborsAt(x, y, z - 1, this->id);
- level->updateNeighborsAt(x, y, z + 1, this->id);
- }
+ level->updateNeighborsAt(x, y - 1, z, this->id);
+ level->updateNeighborsAt(x, y + 1, z, this->id);
+ level->updateNeighborsAt(x - 1, y, z, this->id);
+ level->updateNeighborsAt(x + 1, y, z, this->id);
+ level->updateNeighborsAt(x, y, z - 1, this->id);
+ level->updateNeighborsAt(x, y, z + 1, this->id);
+ }
}
-bool NotGateTile::getSignal(LevelSource *level, int x, int y, int z, int face)
+int NotGateTile::getSignal(LevelSource *level, int x, int y, int z, int face)
{
- if (!on) return false;
+ if (!on) return Redstone::SIGNAL_NONE;
- int dir = level->getData(x, y, z);
+ int dir = level->getData(x, y, z);
- if (dir == 5 && face == 1) return false;
- if (dir == 3 && face == 3) return false;
- if (dir == 4 && face == 2) return false;
- if (dir == 1 && face == 5) return false;
- if (dir == 2 && face == 4) return false;
+ if (dir == 5 && face == 1) return Redstone::SIGNAL_NONE;
+ if (dir == 3 && face == 3) return Redstone::SIGNAL_NONE;
+ if (dir == 4 && face == 2) return Redstone::SIGNAL_NONE;
+ if (dir == 1 && face == 5) return Redstone::SIGNAL_NONE;
+ if (dir == 2 && face == 4) return Redstone::SIGNAL_NONE;
- return true;
+ return Redstone::SIGNAL_MAX;
}
bool NotGateTile::hasNeighborSignal(Level *level, int x, int y, int z)
{
- int dir = level->getData(x, y, z);
+ int dir = level->getData(x, y, z);
- if (dir == 5 && level->getSignal(x, y - 1, z, 0)) return true;
- if (dir == 3 && level->getSignal(x, y, z - 1, 2)) return true;
- if (dir == 4 && level->getSignal(x, y, z + 1, 3)) return true;
- if (dir == 1 && level->getSignal(x - 1, y, z, 4)) return true;
- if (dir == 2 && level->getSignal(x + 1, y, z, 5)) return true;
- return false;
+ if (dir == 5 && level->hasSignal(x, y - 1, z, 0)) return true;
+ if (dir == 3 && level->hasSignal(x, y, z - 1, 2)) return true;
+ if (dir == 4 && level->hasSignal(x, y, z + 1, 3)) return true;
+ if (dir == 1 && level->hasSignal(x - 1, y, z, 4)) return true;
+ if (dir == 2 && level->hasSignal(x + 1, y, z, 5)) return true;
+ return false;
}
void NotGateTile::tick(Level *level, int x, int y, int z, Random *random)
{
- bool neighborSignal = hasNeighborSignal(level, x, y, z);
+ bool neighborSignal = hasNeighborSignal(level, x, y, z);
// 4J - brought forward changes from 1.3.2 to associate toggles with level
if( recentToggles.find(level) != recentToggles.end() )
{
deque<Toggle> *toggles = recentToggles[level];
- while (!toggles->empty() && level->getTime() - toggles->front().when > RECENT_TOGGLE_TIMER)
+ while (!toggles->empty() && level->getGameTime() - toggles->front().when > RECENT_TOGGLE_TIMER)
{
toggles->pop_front();
}
}
- if (on)
+ if (on)
{
- if (neighborSignal)
+ if (neighborSignal)
{
- level->setTileAndData(x, y, z, Tile::notGate_off_Id, level->getData(x, y, z));
+ level->setTileAndData(x, y, z, Tile::redstoneTorch_off_Id, level->getData(x, y, z), Tile::UPDATE_ALL);
- if (isToggledTooFrequently(level, x, y, z, true))
+ if (isToggledTooFrequently(level, x, y, z, true))
{
app.DebugPrintf("Torch at (%d,%d,%d) has toggled too many times\n",x,y,z);
- level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, eSoundType_RANDOM_FIZZ, 0.5f, 2.6f + (level->random->nextFloat() - level->random->nextFloat()) * 0.8f);
- for (int i = 0; i < 5; i++)
+ level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, eSoundType_RANDOM_FIZZ, 0.5f, 2.6f + (level->random->nextFloat() - level->random->nextFloat()) * 0.8f);
+ for (int i = 0; i < 5; i++)
{
- double xx = x + random->nextDouble() * 0.6 + 0.2;
- double yy = y + random->nextDouble() * 0.6 + 0.2;
- double zz = z + random->nextDouble() * 0.6 + 0.2;
-
- level->addParticle(eParticleType_smoke, xx, yy, zz, 0, 0, 0);
- }
- }
- }
- }
+ double xx = x + random->nextDouble() * 0.6 + 0.2;
+ double yy = y + random->nextDouble() * 0.6 + 0.2;
+ double zz = z + random->nextDouble() * 0.6 + 0.2;
+
+ level->addParticle(eParticleType_smoke, xx, yy, zz, 0, 0, 0);
+ }
+ }
+ }
+ }
else
{
- if (!neighborSignal)
+ if (!neighborSignal)
{
- if (!isToggledTooFrequently(level, x, y, z, false))
+ if (!isToggledTooFrequently(level, x, y, z, false))
{
- level->setTileAndData(x, y, z, Tile::notGate_on_Id, level->getData(x, y, z));
- }
+ level->setTileAndData(x, y, z, Tile::redstoneTorch_on_Id, level->getData(x, y, z), Tile::UPDATE_ALL);
+ }
else
{
app.DebugPrintf("Torch at (%d,%d,%d) has toggled too many times\n",x,y,z);
}
- }
- }
+ }
+ }
}
void NotGateTile::neighborChanged(Level *level, int x, int y, int z, int type)
{
- TorchTile::neighborChanged(level, x, y, z, type);
- level->addToTickNextTick(x, y, z, id, getTickDelay());
+ if (checkDoPop(level, x, y, z, type))
+ {
+ return;
+ }
+
+ bool neighborSignal = hasNeighborSignal(level, x, y, z);
+ if ((on && neighborSignal) || (!on && !neighborSignal))
+ {
+ level->addToTickNextTick(x, y, z, id, getTickDelay(level));
+ }
}
-bool NotGateTile::getDirectSignal(Level *level, int x, int y, int z, int face)
+int NotGateTile::getDirectSignal(LevelSource *level, int x, int y, int z, int face)
{
- if (face == 0)
+ if (face == 0)
{
- return getSignal(level, x, y, z, face);
- }
- return false;
+ return getSignal(level, x, y, z, face);
+ }
+ return Redstone::SIGNAL_NONE;
}
int NotGateTile::getResource(int data, Random *random, int playerBonusLevel)
{
- return Tile::notGate_on_Id;
+ return Tile::redstoneTorch_on_Id;
}
bool NotGateTile::isSignalSource()
{
- return true;
+ return true;
}
void NotGateTile::animateTick(Level *level, int xt, int yt, int zt, Random *random)
{
- if (!on) return;
- int dir = level->getData(xt, yt, zt);
- double x = xt + 0.5f + (random->nextFloat() - 0.5f) * 0.2;
- double y = yt + 0.7f + (random->nextFloat() - 0.5f) * 0.2;
- double z = zt + 0.5f + (random->nextFloat() - 0.5f) * 0.2;
- double h = 0.22f;
- double r = 0.27f;
- if (dir == 1)
- {
- level->addParticle(eParticleType_reddust, x - r, y + h, z, 0, 0, 0);
- }
+ if (!on) return;
+ int dir = level->getData(xt, yt, zt);
+ double x = xt + 0.5f + (random->nextFloat() - 0.5f) * 0.2;
+ double y = yt + 0.7f + (random->nextFloat() - 0.5f) * 0.2;
+ double z = zt + 0.5f + (random->nextFloat() - 0.5f) * 0.2;
+ double h = 0.22f;
+ double r = 0.27f;
+ if (dir == 1)
+ {
+ level->addParticle(eParticleType_reddust, x - r, y + h, z, 0, 0, 0);
+ }
else if(dir == 2)
{
- level->addParticle(eParticleType_reddust, x + r, y + h, z, 0, 0, 0);
- }
+ level->addParticle(eParticleType_reddust, x + r, y + h, z, 0, 0, 0);
+ }
else if (dir == 3)
{
- level->addParticle(eParticleType_reddust, x, y + h, z - r, 0, 0, 0);
- }
+ level->addParticle(eParticleType_reddust, x, y + h, z - r, 0, 0, 0);
+ }
else if (dir == 4)
{
- level->addParticle(eParticleType_reddust, x, y + h, z + r, 0, 0, 0);
- }
+ level->addParticle(eParticleType_reddust, x, y + h, z + r, 0, 0, 0);
+ }
else
{
- level->addParticle(eParticleType_reddust, x, y, z, 0, 0, 0);
- }
+ level->addParticle(eParticleType_reddust, x, y, z, 0, 0, 0);
+ }
}
int NotGateTile::cloneTileId(Level *level, int x, int y, int z)
{
- return Tile::notGate_on_Id;
+ return Tile::redstoneTorch_on_Id;
}
void NotGateTile::levelTimeChanged(Level *level, __int64 delta, __int64 newTime)
@@ -234,14 +243,7 @@ void NotGateTile::levelTimeChanged(Level *level, __int64 delta, __int64 newTime)
}
}
-void NotGateTile::registerIcons(IconRegister *iconRegister)
+bool NotGateTile::isMatching(int id)
{
- if (on)
- {
- icon = iconRegister->registerIcon(L"redtorch_lit");
- }
- else
- {
- icon = iconRegister->registerIcon(L"redtorch");
- }
+ return id == Tile::redstoneTorch_off_Id || id == Tile::redstoneTorch_on_Id;
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-22 02:04:12 +0000