Give MTEs a owner on placement (#2540)

GregTechCEu · Sep 4, 2024 · cc0e414 · cc0e414
1 parent 518a896
commit cc0e414
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 8 deletions.
diff --git a/src/main/java/gregtech/api/block/machines/BlockMachine.java b/src/main/java/gregtech/api/block/machines/BlockMachine.java
@@ -332,7 +332,7 @@ public void onBlockPlacedBy(World worldIn, @NotNull BlockPos pos, @NotNull IBloc
                 }
             }
 
-            metaTileEntity.onPlacement();
+            metaTileEntity.onPlacement(placer);
         }
     }
 

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -45,6 +45,7 @@
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
@@ -109,6 +110,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -160,6 +162,8 @@ public abstract class MetaTileEntity implements ISyncedTileEntity, CoverHolder,
     private int playSoundCooldown = 0;
     private int lastTick = 0;
 
+    private UUID owner;
+
     protected MetaTileEntity(@NotNull ResourceLocation metaTileEntityId) {
         this.metaTileEntityId = metaTileEntityId;
         this.registry = GregTechAPI.mteManager.getRegistry(metaTileEntityId.getNamespace());
@@ -506,6 +510,10 @@ public boolean onRightClick(EntityPlayer playerIn, EnumHand hand, EnumFacing fac
                 } else {
                     MetaTileEntityUIFactory.INSTANCE.openUI(getHolder(), (EntityPlayerMP) playerIn);
                 }
+
+                if (getOwner() == null) {
+                    this.owner = playerIn.getUniqueID();
+                }
             }
             return true;
         } else {
@@ -1293,6 +1301,9 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
         CoverSaveHandler.writeCoverNBT(data, this);
 
         data.setBoolean(TAG_KEY_MUFFLED, muffled);
+
+        data.setUniqueId("Owner", owner);
+
         return data;
     }
 
@@ -1318,6 +1329,8 @@ public void readFromNBT(NBTTagCompound data) {
 
         CoverSaveHandler.readCoverNBT(data, this, covers::put);
         this.muffled = data.getBoolean(TAG_KEY_MUFFLED);
+
+        this.owner = data.getUniqueId("Owner");
     }
 
     @Override
@@ -1346,12 +1359,28 @@ public int getItemStackLimit(ItemStack stack) {
     }
 
     /**
-     * Called whenever a MetaTileEntity is placed in world by {@link Block#onBlockPlacedBy}
+     * Called whenever a MetaTileEntity is placed in world by {@link Block#onBlockPlacedBy},
+     * gives the MetaTileEntity an Owner by UUID
+     * <p>
+     * If placing an MTE with methods such as {@link World#setBlockState(BlockPos, IBlockState)},
+     * this should be manually called immediately afterwards
+     */
+    public void onPlacement(@Nullable EntityLivingBase placer) {
+        if (placer instanceof EntityPlayer player) {
+            this.owner = player.getUniqueID();
+        }
+    }
+
+    /**
+     * Called whenever a MetaTileEntity is placed in world by {@link Block#onBlockPlacedBy},
+     * gives the MetaTileEntity an Owner of Null
      * <p>
      * If placing an MTE with methods such as {@link World#setBlockState(BlockPos, IBlockState)},
      * this should be manually called immediately afterwards
      */
-    public void onPlacement() {}
+    public void onPlacement() {
+        this.owner = null;
+    }
 
     /**
      * Called from breakBlock right before meta tile entity destruction
@@ -1451,6 +1480,11 @@ public boolean getWitherProof() {
         return false;
     }
 
+    @Nullable
+    public UUID getOwner() {
+        return owner;
+    }
+
     public final void toggleMuffled() {
         muffled = !muffled;
         if (!getWorld().isRemote) {

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntityHolder.java
@@ -395,7 +395,7 @@ public void onChunkUnload() {
     public boolean shouldRefresh(@NotNull World world, @NotNull BlockPos pos, IBlockState oldState,
                                  IBlockState newState) {
         return oldState.getBlock() != newState.getBlock(); // MetaTileEntityHolder should never refresh (until block
-                                                           // changes)
+        // changes)
     }
 
     @Override

diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java b/src/main/java/gregtech/api/metatileentity/multiblock/MultiblockControllerBase.java
@@ -30,6 +30,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -91,8 +92,8 @@ public MultiblockControllerBase(ResourceLocation metaTileEntityId) {
     }
 
     @Override
-    public void onPlacement() {
-        super.onPlacement();
+    public void onPlacement(EntityLivingBase placer) {
+        super.onPlacement(placer);
         reinitializeStructurePattern();
     }
 

diff --git a/src/main/java/gregtech/api/pattern/BlockPattern.java b/src/main/java/gregtech/api/pattern/BlockPattern.java
@@ -390,7 +390,7 @@ public void autoBuild(EntityPlayer player, MultiblockControllerBase controllerBa
                                 MetaTileEntity sampleMetaTileEntity = registry.getObjectById(found.getItemDamage());
                                 if (sampleMetaTileEntity != null) {
                                     MetaTileEntity metaTileEntity = igtte.setMetaTileEntity(sampleMetaTileEntity);
-                                    metaTileEntity.onPlacement();
+                                    metaTileEntity.onPlacement(player);
                                     blocks.put(pos, metaTileEntity);
                                     if (found.getTagCompound() != null) {
                                         metaTileEntity.initFromItemStackData(found.getTagCompound());

diff --git a/src/main/java/gregtech/common/items/behaviors/TricorderBehavior.java b/src/main/java/gregtech/common/items/behaviors/TricorderBehavior.java
@@ -49,6 +49,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 
 public class TricorderBehavior implements IItemBehaviour {
 
@@ -141,13 +142,29 @@ public List<ITextComponent> getScannerInfo(EntityPlayer player, World world, Blo
 
             // name of the machine
             list.add(new TextComponentTranslation("behavior.tricorder.block_name",
-                    new TextComponentTranslation(LocalizationUtils.format(metaTileEntity.getMetaFullName()))
+                    new TextComponentTranslation(metaTileEntity.getMetaFullName())
                             .setStyle(new Style().setColor(TextFormatting.BLUE)),
                     new TextComponentTranslation(TextFormattingUtil
                             .formatNumbers(
                                     metaTileEntity.getRegistry().getIdByObjectName(metaTileEntity.metaTileEntityId)))
                                             .setStyle(new Style().setColor(TextFormatting.BLUE))));
 
+            UUID owner = metaTileEntity.getOwner();
+            if (owner != null) {
+                EntityPlayer ownerEntity = metaTileEntity.getWorld().getPlayerEntityByUUID(owner);
+                if (ownerEntity != null) {
+                    list.add(new TextComponentTranslation("behavior.tricorder.mte_owner",
+                            new TextComponentTranslation(ownerEntity.getName())
+                                    .setStyle(new Style().setColor(TextFormatting.AQUA))));
+                } else {
+                    list.add(new TextComponentTranslation("behavior.tricorder.mte_owner_offline")
+                            .setStyle(new Style().setColor(TextFormatting.YELLOW)));
+                }
+            } else {
+                list.add(new TextComponentTranslation("behavior.tricorder.mte_owner_null")
+                        .setStyle(new Style().setColor(TextFormatting.RED)));
+            }
+
             list.add(new TextComponentTranslation("behavior.tricorder.divider"));
 
             // fluid tanks

diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -2466,6 +2466,9 @@ behavior.tricorder.debug_machine_invalid_null=invalid! MetaTileEntity == null!
 behavior.tricorder.debug_cpu_load=Average CPU load of ~%sns over %s ticks with worst time of %sns.
 behavior.tricorder.debug_cpu_load_seconds=This is %s seconds.
 behavior.tricorder.debug_lag_count=Caused %s Lag Spike Warnings (anything taking longer than %sms) on the Server.
+behavior.tricorder.mte_owner=Owner: %s
+behavior.tricorder.mte_owner_offline=Owner is Offline or Offworld!
+behavior.tricorder.mte_owner_null=This wasn't placed by a player!
 
 metaitem.item_magnet.lv.name=Low Voltage Item Magnet
 metaitem.item_magnet.hv.name=High Voltage Item Magnet