dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors in integration pkg

Browse Source
This commit is contained in:
raoulvdberge
2019-08-29 11:37:27 +02:00
parent e455a56c36
commit 74a5b5df23
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/raoulvdberge/refinedstorage/integration/forgeenergy/ItemEnergyForge.java
View File

@@ -1,7 +1,7 @@
package com.raoulvdberge.refinedstorage.integration.forgeenergy; package com.raoulvdberge.refinedstorage.integration.forgeenergy;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.energy.EnergyStorage; import net.minecraftforge.energy.EnergyStorage;
public class ItemEnergyForge extends EnergyStorage { public class ItemEnergyForge extends EnergyStorage {
@@ -13,7 +13,7 @@ public class ItemEnergyForge extends EnergyStorage {
super(capacity, Integer.MAX_VALUE, Integer.MAX_VALUE); super(capacity, Integer.MAX_VALUE, Integer.MAX_VALUE);
this.stack = stack; this.stack = stack;
this.energy = stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_ENERGY) ? stack.getTagCompound().getInteger(NBT_ENERGY) : 0; this.energy = stack.hasTag() && stack.getTag().contains(NBT_ENERGY) ? stack.getTag().getInt(NBT_ENERGY) : 0;
} }
@Override @Override
@@ -21,11 +21,11 @@ public class ItemEnergyForge extends EnergyStorage {
int received = super.receiveEnergy(maxReceive, simulate); int received = super.receiveEnergy(maxReceive, simulate);
if (received > 0 && !simulate) { if (received > 0 && !simulate) {
if (!stack.hasTagCompound()) { if (!stack.hasTag()) {
stack.setTagCompound(new NBTTagCompound()); stack.setTag(new CompoundNBT());
} }
stack.getTagCompound().setInteger(NBT_ENERGY, getEnergyStored()); stack.getTag().putInt(NBT_ENERGY, getEnergyStored());
} }
return received; return received;
@@ -36,11 +36,11 @@ public class ItemEnergyForge extends EnergyStorage {
int extracted = super.extractEnergy(maxExtract, simulate); int extracted = super.extractEnergy(maxExtract, simulate);
if (extracted > 0 && !simulate) { if (extracted > 0 && !simulate) {
if (!stack.hasTagCompound()) { if (!stack.hasTag()) {
stack.setTagCompound(new NBTTagCompound()); stack.setTag(new CompoundNBT());
} }
stack.getTagCompound().setInteger(NBT_ENERGY, getEnergyStored()); stack.getTag().putInt(NBT_ENERGY, getEnergyStored());
} }
return extracted; return extracted;