mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge branch '1.11' of github.com:aidancbrady/Mekanism into 1.11
This commit is contained in:
commit
29615cc6a9
83 files changed
+502
-559
No files matched your search
@@ -36,6 +36,7 @@ import mekanism.common.block.states.BlockStateMachine.MachineType;
|
||||
import mekanism.common.capabilities.ItemCapabilityWrapper;
|
||||
import mekanism.common.config.MekanismConfig.general;
|
||||
import mekanism.common.integration.MekanismHooks;
|
||||
import mekanism.common.frequency.Frequency;
|
||||
import mekanism.common.integration.forgeenergy.ForgeEnergyItemWrapper;
|
||||
import mekanism.common.integration.ic2.IC2ItemManager;
|
||||
import mekanism.common.integration.tesla.TeslaItemWrapper;
|
||||
@@ -46,6 +47,7 @@ import mekanism.common.security.ISecurityTile;
|
||||
import mekanism.common.security.ISecurityTile.SecurityMode;
|
||||
import mekanism.common.tile.TileEntityFactory;
|
||||
import mekanism.common.tile.TileEntityFluidTank;
|
||||
import mekanism.common.tile.TileEntityQuantumEntangloporter;
|
||||
import mekanism.common.tile.prefab.TileEntityBasicBlock;
|
||||
import mekanism.common.tile.prefab.TileEntityElectricBlock;
|
||||
import mekanism.common.util.ItemDataUtils;
|
||||
@@ -241,6 +243,15 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.portableTank.bucketMode") + ": " + EnumColor.GREY + LangUtils.transYesNo(getBucketMode(itemstack)));
|
||||
}
|
||||
|
||||
if (type == MachineType.QUANTUM_ENTANGLOPORTER)
|
||||
{
|
||||
Frequency.Identity freq = Frequency.Identity.load(ItemDataUtils.getCompound(itemstack, "entangleporter_frequency"));
|
||||
if (freq != null)
|
||||
{
|
||||
list.add(EnumColor.INDIGO + LangUtils.localize("gui.frequency") + ": "+EnumColor.GREY + freq.name + " (" + LangUtils.localize(freq.publicFreq ? "security.public" : "security.private") + ")");
|
||||
}
|
||||
}
|
||||
|
||||
if(type.isElectric)
|
||||
{
|
||||
list.add(EnumColor.BRIGHT_GREEN + LangUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack), getMaxEnergy(itemstack)));
|
||||
@@ -414,6 +425,15 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
((TileEntityElectricBlock)tileEntity).electricityStored = getEnergy(stack);
|
||||
}
|
||||
|
||||
if (tileEntity instanceof TileEntityQuantumEntangloporter && ItemDataUtils.hasData(stack, "entangleporter_frequency"))
|
||||
{
|
||||
Frequency.Identity freq = Frequency.Identity.load(ItemDataUtils.getCompound(stack, "entangleporter_frequency"));
|
||||
if (freq != null)
|
||||
{
|
||||
((TileEntityQuantumEntangloporter) tileEntity).setFrequency(freq.name, freq.publicFreq);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user