mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-04-24 10:43:39 +00:00
# Conflicts: # Minecraft.Client/Network/PlayerChunkMap.cpp # Minecraft.Client/Network/PlayerList.cpp # Minecraft.Client/Network/ServerChunkCache.cpp # Minecraft.Client/Platform/Common/Consoles_App.cpp # Minecraft.Client/Platform/Common/DLC/DLCManager.cpp # Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp # Minecraft.Client/Platform/Common/GameRules/LevelRuleset.cpp # Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp # Minecraft.Client/Platform/Common/Tutorial/TutorialTask.cpp # Minecraft.Client/Platform/Common/UI/IUIScene_CreativeMenu.cpp # Minecraft.Client/Platform/Common/UI/UIComponent_Panorama.cpp # Minecraft.Client/Platform/Common/UI/UIController.cpp # Minecraft.Client/Platform/Common/UI/UIController.h # Minecraft.Client/Platform/Extrax64Stubs.cpp # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Input.h # Minecraft.Client/Platform/Windows64/4JLibs/inc/4J_Storage.h # Minecraft.Client/Player/EntityTracker.cpp # Minecraft.Client/Player/ServerPlayer.cpp # Minecraft.Client/Rendering/EntityRenderers/PlayerRenderer.cpp # Minecraft.Client/Textures/Packs/DLCTexturePack.cpp # Minecraft.Client/Textures/Stitching/StitchedTexture.cpp # Minecraft.Client/Textures/Stitching/TextureMap.cpp # Minecraft.Client/Textures/Textures.cpp # Minecraft.World/Blocks/NotGateTile.cpp # Minecraft.World/Blocks/PressurePlateTile.cpp # Minecraft.World/Blocks/TileEntities/PotionBrewing.cpp # Minecraft.World/Enchantments/EnchantmentHelper.cpp # Minecraft.World/Entities/HangingEntity.cpp # Minecraft.World/Entities/LeashFenceKnotEntity.cpp # Minecraft.World/Entities/LivingEntity.cpp # Minecraft.World/Entities/Mobs/Boat.cpp # Minecraft.World/Entities/Mobs/Minecart.cpp # Minecraft.World/Entities/Mobs/Witch.cpp # Minecraft.World/Entities/SyncedEntityData.cpp # Minecraft.World/Items/LeashItem.cpp # Minecraft.World/Items/PotionItem.cpp # Minecraft.World/Level/BaseMobSpawner.cpp # Minecraft.World/Level/CustomLevelSource.cpp # Minecraft.World/Level/Level.cpp # Minecraft.World/Level/Storage/DirectoryLevelStorage.cpp # Minecraft.World/Level/Storage/McRegionLevelStorage.cpp # Minecraft.World/Level/Storage/RegionFileCache.cpp # Minecraft.World/Player/Player.cpp # Minecraft.World/WorldGen/Biomes/BiomeCache.cpp # Minecraft.World/WorldGen/Features/RandomScatteredLargeFeature.cpp # Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
#include "../../Platform/stdafx.h"
|
|
|
|
#include "Attribute.h"
|
|
#include "RangedAttribute.h"
|
|
#include "AttributeInstance.h"
|
|
#include "ModifiableAttributeInstance.h"
|
|
#include "ServersideAttributeMap.h"
|
|
|
|
AttributeInstance* ServersideAttributeMap::getInstance(Attribute* attribute) {
|
|
return BaseAttributeMap::getInstance(attribute);
|
|
}
|
|
|
|
AttributeInstance* ServersideAttributeMap::getInstance(eATTRIBUTE_ID id) {
|
|
AttributeInstance* result = BaseAttributeMap::getInstance(id);
|
|
|
|
// 4J: Removed legacy name
|
|
// If we didn't find it, search by legacy name
|
|
/*if (result == nullptr)
|
|
{
|
|
auto it = attributesByLegacy.find(name);
|
|
if(it != attributesByLegacy.end())
|
|
{
|
|
result = it->second;
|
|
}
|
|
}*/
|
|
|
|
return result;
|
|
}
|
|
|
|
AttributeInstance* ServersideAttributeMap::registerAttribute(
|
|
Attribute* attribute) {
|
|
auto it = attributesById.find(attribute->getId());
|
|
if (it != attributesById.end()) {
|
|
return it->second;
|
|
}
|
|
|
|
AttributeInstance* instance =
|
|
new ModifiableAttributeInstance(this, attribute);
|
|
attributesById.insert(std::pair<eATTRIBUTE_ID, AttributeInstance*>(
|
|
attribute->getId(), instance));
|
|
|
|
// 4J: Removed legacy name
|
|
// If this is a ranged attribute also add to legacy name map
|
|
/*RangedAttribute *rangedAttribute =
|
|
dynamic_cast<RangedAttribute*>(attribute); if (rangedAttribute != nullptr &&
|
|
rangedAttribute->getImportLegacyName() != L"")
|
|
{
|
|
attributesByLegacy.insert(std::pair<std::wstring,
|
|
AttributeInstance*>(rangedAttribute->getImportLegacyName(), instance));
|
|
}*/
|
|
|
|
return instance;
|
|
}
|
|
|
|
void ServersideAttributeMap::onAttributeModified(
|
|
ModifiableAttributeInstance* attributeInstance) {
|
|
if (attributeInstance->getAttribute()->isClientSyncable()) {
|
|
dirtyAttributes.insert(attributeInstance);
|
|
}
|
|
}
|
|
|
|
std::unordered_set<AttributeInstance*>*
|
|
ServersideAttributeMap::getDirtyAttributes() {
|
|
return &dirtyAttributes;
|
|
}
|
|
|
|
std::unordered_set<AttributeInstance*>*
|
|
ServersideAttributeMap::getSyncableAttributes() {
|
|
std::unordered_set<AttributeInstance*>* result =
|
|
new std::unordered_set<AttributeInstance*>();
|
|
std::vector<AttributeInstance*> atts;
|
|
getAttributes(atts);
|
|
for (int i = 0; i < atts.size(); i++) {
|
|
AttributeInstance* instance = atts.at(i);
|
|
|
|
if (instance->getAttribute()->isClientSyncable()) {
|
|
result->insert(instance);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
} |