mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Merge pull request #4346 from thommy101/issue-4342
Fix more UUID changes. Fix Robit owner.
This commit is contained in:
commit
ca4a49ba0f
12 files changed
+48
-41
No files matched your search
@@ -21,7 +21,7 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
public class MekanismClient extends Mekanism
|
||||
{
|
||||
public static Map<String, SecurityData> clientSecurityMap = new HashMap<String, SecurityData>();
|
||||
public static Map<UUID, SecurityData> clientSecurityMap = new HashMap<UUID, SecurityData>();
|
||||
public static Map<UUID, String> clientUUIDMap = new HashMap<UUID, String>();
|
||||
|
||||
public static VoiceClient voiceClient;
|
||||
|
||||
@@ -74,7 +74,7 @@ public class GuiSecurityTab extends GuiElement
|
||||
|
||||
int renderX = 26 + (18*mode.ordinal());
|
||||
|
||||
if(getOwner() != null && getOwner().equals(mc.player.getName()) && (data == null || !data.override))
|
||||
if(getOwner() != null && getOwner().equals(mc.player.getUniqueID()) && (data == null || !data.override))
|
||||
{
|
||||
if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54)
|
||||
{
|
||||
@@ -201,7 +201,7 @@ public class GuiSecurityTab extends GuiElement
|
||||
{
|
||||
if(button == 0 && general.allowProtection)
|
||||
{
|
||||
if(getOwner() != null && mc.player.getName().equals(getOwner()))
|
||||
if(getOwner() != null && mc.player.getUniqueID().equals(getOwner()))
|
||||
{
|
||||
if(xAxis >= 179 && xAxis <= 197 && yAxis >= 36 && yAxis <= 54)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,7 @@ import ic2.api.item.IElectricItem;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.energy.EnergizedItemManager;
|
||||
@@ -52,6 +53,7 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.UsernameCache;
|
||||
import net.minecraftforge.common.util.Constants;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
@@ -75,7 +77,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
public boolean texTick;
|
||||
|
||||
private static final DataParameter<Float> ELECTRICITY = EntityDataManager.<Float>createKey(EntityRobit.class, DataSerializers.FLOAT);
|
||||
private static final DataParameter<String> OWNER = EntityDataManager.<String>createKey(EntityRobit.class, DataSerializers.STRING);
|
||||
private static final DataParameter<String> OWNER_UUID = EntityDataManager.<String>createKey(EntityRobit.class, DataSerializers.STRING);
|
||||
private static final DataParameter<Boolean> FOLLOW = EntityDataManager.<Boolean>createKey(EntityRobit.class, DataSerializers.BOOLEAN);
|
||||
private static final DataParameter<Boolean> DROP_PICKUP = EntityDataManager.<Boolean>createKey(EntityRobit.class, DataSerializers.BOOLEAN);
|
||||
|
||||
@@ -134,7 +136,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
super.entityInit();
|
||||
|
||||
dataManager.register(ELECTRICITY, 0F);
|
||||
dataManager.register(OWNER, "");
|
||||
dataManager.register(OWNER_UUID, "");
|
||||
dataManager.register(FOLLOW, false);
|
||||
dataManager.register(DROP_PICKUP, false);
|
||||
}
|
||||
@@ -443,9 +445,9 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
|
||||
nbtTags.setString("name", getName());
|
||||
|
||||
if(getOwnerName() != null)
|
||||
if(getOwnerUUID() != null)
|
||||
{
|
||||
nbtTags.setString("owner", getOwnerName());
|
||||
nbtTags.setString("ownerUUID", getOwnerUUID().toString());
|
||||
}
|
||||
|
||||
nbtTags.setBoolean("follow", getFollowing());
|
||||
@@ -482,9 +484,9 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
|
||||
setCustomNameTag(nbtTags.getString("name"));
|
||||
|
||||
if(nbtTags.hasKey("owner"))
|
||||
if(nbtTags.hasKey("ownerUUID"))
|
||||
{
|
||||
setOwner(nbtTags.getString("owner"));
|
||||
setOwnerUUID(UUID.fromString(nbtTags.getString("ownerUUID")));
|
||||
}
|
||||
|
||||
setFollowing(nbtTags.getBoolean("follow"));
|
||||
@@ -552,17 +554,22 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine
|
||||
|
||||
public EntityPlayer getOwner()
|
||||
{
|
||||
return world.getPlayerEntityByName(getOwnerName());
|
||||
return world.getPlayerEntityByUUID(getOwnerUUID());
|
||||
}
|
||||
|
||||
public String getOwnerName()
|
||||
{
|
||||
return dataManager.get(OWNER);
|
||||
return UsernameCache.getLastKnownUsername(getOwnerUUID());
|
||||
}
|
||||
|
||||
public void setOwner(String username)
|
||||
public UUID getOwnerUUID()
|
||||
{
|
||||
dataManager.set(OWNER, username);
|
||||
return UUID.fromString(dataManager.get(OWNER_UUID));
|
||||
}
|
||||
|
||||
public void setOwnerUUID(UUID uuid)
|
||||
{
|
||||
dataManager.set(OWNER_UUID, uuid.toString());
|
||||
}
|
||||
|
||||
public boolean getFollowing()
|
||||
|
||||
@@ -334,9 +334,9 @@ public class FrequencyManager
|
||||
try {
|
||||
String frequencyClass = nbtTags.getString("frequencyClass");
|
||||
|
||||
if(nbtTags.hasKey("owner"))
|
||||
if(nbtTags.hasKey("ownerUUID"))
|
||||
{
|
||||
loadedOwner = UUID.fromString(nbtTags.getString("owner"));
|
||||
loadedOwner = UUID.fromString(nbtTags.getString("ownerUUID"));
|
||||
}
|
||||
|
||||
NBTTagList list = nbtTags.getTagList("freqList", NBT.TAG_COMPOUND);
|
||||
@@ -364,7 +364,7 @@ public class FrequencyManager
|
||||
|
||||
if(manager.ownerUUID != null)
|
||||
{
|
||||
nbtTags.setString("owner", manager.ownerUUID.toString());
|
||||
nbtTags.setString("ownerUUID", manager.ownerUUID.toString());
|
||||
}
|
||||
|
||||
NBTTagList list = new NBTTagList();
|
||||
|
||||
@@ -333,9 +333,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
|
||||
@Override
|
||||
public UUID getOwnerUUID(ItemStack stack)
|
||||
{
|
||||
if(ItemDataUtils.hasData(stack, "owner"))
|
||||
if(ItemDataUtils.hasData(stack, "ownerUUID"))
|
||||
{
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "owner"));
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID"));
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -346,11 +346,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IS
|
||||
{
|
||||
if(owner == null)
|
||||
{
|
||||
ItemDataUtils.removeData(stack, "owner");
|
||||
ItemDataUtils.removeData(stack, "ownerUUID");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemDataUtils.setString(stack, "owner", owner.toString());
|
||||
ItemDataUtils.setString(stack, "ownerUUID", owner.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -351,9 +351,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
@Override
|
||||
public UUID getOwnerUUID(ItemStack stack)
|
||||
{
|
||||
if(ItemDataUtils.hasData(stack, "owner"))
|
||||
if(ItemDataUtils.hasData(stack, "ownerUUID"))
|
||||
{
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "owner"));
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID"));
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -364,11 +364,11 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI
|
||||
{
|
||||
if(owner == null)
|
||||
{
|
||||
ItemDataUtils.removeData(stack, "owner");
|
||||
ItemDataUtils.removeData(stack, "ownerUUID");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemDataUtils.setString(stack, "owner", owner.toString());
|
||||
ItemDataUtils.setString(stack, "ownerUUID", owner.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -871,9 +871,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
@Override
|
||||
public UUID getOwnerUUID(ItemStack stack)
|
||||
{
|
||||
if(ItemDataUtils.hasData(stack, "owner"))
|
||||
if(ItemDataUtils.hasData(stack, "ownerUUID"))
|
||||
{
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "owner"));
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID"));
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -884,11 +884,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
{
|
||||
if(owner == null)
|
||||
{
|
||||
ItemDataUtils.removeData(stack, "owner");
|
||||
ItemDataUtils.removeData(stack, "ownerUUID");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemDataUtils.setString(stack, "owner", owner.toString());
|
||||
ItemDataUtils.setString(stack, "ownerUUID", owner.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -100,9 +100,9 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem
|
||||
@Override
|
||||
public UUID getOwnerUUID(ItemStack stack)
|
||||
{
|
||||
if(ItemDataUtils.hasData(stack, "owner"))
|
||||
if(ItemDataUtils.hasData(stack, "ownerUUID"))
|
||||
{
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "owner"));
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID"));
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -116,11 +116,11 @@ public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem
|
||||
|
||||
if(owner == null)
|
||||
{
|
||||
ItemDataUtils.removeData(stack, "owner");
|
||||
ItemDataUtils.removeData(stack, "ownerUUID");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemDataUtils.setString(stack, "owner", owner.toString());
|
||||
ItemDataUtils.setString(stack, "ownerUUID", owner.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -56,7 +56,7 @@ public class ItemRobit extends ItemEnergized implements ISustainedInventory
|
||||
|
||||
robit.setHome(Coord4D.get(chargepad));
|
||||
robit.setEnergy(getEnergy(itemstack));
|
||||
robit.setOwner(entityplayer.getName());
|
||||
robit.setOwnerUUID(entityplayer.getUniqueID());
|
||||
robit.setInventory(getInventory(itemstack));
|
||||
robit.setCustomNameTag(getName(itemstack));
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa
|
||||
{
|
||||
if(message.securityData != null)
|
||||
{
|
||||
MekanismClient.clientSecurityMap.put(message.playerUsername, message.securityData);
|
||||
MekanismClient.clientSecurityMap.put(message.playerUUID, message.securityData);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ public class PacketSecurityUpdate implements IMessageHandler<SecurityUpdateMessa
|
||||
{
|
||||
UUID uuid = UUID.fromString(PacketHandler.readString(dataStream));
|
||||
String username = PacketHandler.readString(dataStream);
|
||||
MekanismClient.clientSecurityMap.put(username, SecurityData.read(dataStream));
|
||||
MekanismClient.clientSecurityMap.put(uuid, SecurityData.read(dataStream));
|
||||
MekanismClient.clientUUIDMap.put(uuid, username);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ public final class SecurityUtils
|
||||
}
|
||||
else if(side == Side.CLIENT)
|
||||
{
|
||||
SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getClientOwner());
|
||||
SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwnerUUID());
|
||||
|
||||
if(data != null && data.override)
|
||||
{
|
||||
@@ -249,7 +249,7 @@ public final class SecurityUtils
|
||||
return freq != null && freq.override;
|
||||
}
|
||||
else {
|
||||
SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getClientOwner());
|
||||
SecurityData data = MekanismClient.clientSecurityMap.get(security.getSecurity().getOwnerUUID());
|
||||
|
||||
return data != null && data.override;
|
||||
}
|
||||
|
||||
@@ -420,9 +420,9 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
|
||||
@Override
|
||||
public UUID getOwnerUUID(ItemStack stack)
|
||||
{
|
||||
if(ItemDataUtils.hasData(stack, "owner"))
|
||||
if(ItemDataUtils.hasData(stack, "ownerUUID"))
|
||||
{
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "owner"));
|
||||
return UUID.fromString(ItemDataUtils.getString(stack, "ownerUUID"));
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -433,11 +433,11 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp
|
||||
{
|
||||
if(owner == null)
|
||||
{
|
||||
ItemDataUtils.removeData(stack, "owner");
|
||||
ItemDataUtils.removeData(stack, "ownerUUID");
|
||||
return;
|
||||
}
|
||||
|
||||
ItemDataUtils.setString(stack, "owner", owner.toString());
|
||||
ItemDataUtils.setString(stack, "ownerUUID", owner.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user