mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Add Mekanism Shaped and Mekanism Shapeless recipe handlers, use ItemDataUtils to consolidate non-subtype-based NBT data into a single compound
This commit is contained in:
1 parent
2f61ea103f
commit
be863a4289
53 files changed
+679
-789
No files matched your search
@@ -46,6 +46,7 @@ import mekanism.common.tile.TileEntityLaserAmplifier;
|
||||
import mekanism.common.tile.TileEntityLogisticalSorter;
|
||||
import mekanism.common.tile.TileEntityMetallurgicInfuser;
|
||||
import mekanism.common.tile.TileEntityPersonalChest;
|
||||
import mekanism.common.util.ItemDataUtils;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.SecurityUtils;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -864,14 +865,15 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
|
||||
|
||||
if(tileEntity instanceof IUpgradeTile)
|
||||
{
|
||||
((IUpgradeTile)tileEntity).getComponent().write(itemStack.getTagCompound());
|
||||
((IUpgradeTile)tileEntity).getComponent().write(ItemDataUtils.getDataMap(itemStack));
|
||||
}
|
||||
|
||||
if(tileEntity instanceof ISideConfiguration)
|
||||
{
|
||||
ISideConfiguration config = (ISideConfiguration)tileEntity;
|
||||
|
||||
config.getConfig().write(itemStack.getTagCompound());
|
||||
config.getConfig().write(ItemDataUtils.getDataMap(itemStack));
|
||||
config.getEjector().write(ItemDataUtils.getDataMap(itemStack));
|
||||
}
|
||||
|
||||
if(tileEntity instanceof ISustainedData)
|
||||
@@ -882,7 +884,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
|
||||
if(tileEntity instanceof IRedstoneControl)
|
||||
{
|
||||
IRedstoneControl control = (IRedstoneControl)tileEntity;
|
||||
itemStack.getTagCompound().setInteger("controlType", control.getControlType().ordinal());
|
||||
ItemDataUtils.setInt(itemStack, "controlType", control.getControlType().ordinal());
|
||||
}
|
||||
|
||||
if(tileEntity instanceof IStrictEnergyStorage)
|
||||
|
||||
Reference in new issue
Block a user