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

Check volatiles. Fixed Portable Grid losing enchantments when placing and breaking.

Browse Source
This commit is contained in:
raoulvdberge
2020-09-11 23:07:47 +02:00
parent 21639a4e8e
commit d6c801baf8
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
View File

@@ -146,17 +146,14 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
}
}
// @Volatile: From BlockDispenser#getDispensePosition
private double getDispensePositionX() {
return (double) pos.getX() + 0.5D + 0.8D * (double) getDirection().getXOffset();
}
// @Volatile: From BlockDispenser#getDispensePosition
private double getDispensePositionY() {
return (double) pos.getY() + (getDirection() == Direction.DOWN ? 0.45D : 0.5D) + 0.8D * (double) getDirection().getYOffset();
}
// @Volatile: From BlockDispenser#getDispensePosition
private double getDispensePositionZ() {
return (double) pos.getZ() + 0.5D + 0.8D * (double) getDirection().getZOffset();
}

1
src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
View File

@@ -162,7 +162,6 @@ public abstract class BaseContainer extends Container {
private boolean isTileStillThere() {
if (tile != null) {
// @Volatile: Logic from LockableLootTileEntity#isUsableByPlayer
return tile.getWorld().getTileEntity(tile.getPos()) == tile;
}

5
src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java
View File

@@ -53,8 +53,9 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe {
for (int i = 0; i < enchantments.size(); ++i) {
CompoundNBT enchantmentNbt = enchantments.getCompound(i);
// @Volatile: NBT tags from ItemEnchantedBook
if (ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(enchantmentNbt.getString("id"))) == enchant.enchantment && enchantmentNbt.getShort("lvl") == enchant.enchantmentLevel) {
// @Volatile: NBT tags from EnchantedBookItem
if (ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(enchantmentNbt.getString("id"))) == enchant.enchantment &&
enchantmentNbt.getShort("lvl") == enchant.enchantmentLevel) {
return true;
}
}

3
src/main/java/com/refinedmods/refinedstorage/tile/grid/portable/PortableGridTile.java
View File

@@ -117,7 +117,8 @@ public class PortableGridTile extends BaseTile implements IGrid, IPortableGrid,
private static final String NBT_FLUID_STORAGE_TRACKER = "FluidStorageTracker";
private static final String NBT_TYPE = "Type";
private static final String NBT_ENERGY = "Energy";
private static final String NBT_ENCHANTMENTS = "ench"; // @Volatile: minecraft specific nbt key
private static final String NBT_ENCHANTMENTS = "Enchantments"; // @Volatile: Minecraft specific nbt key, see EnchantmentHelper
private EnergyStorage energyStorage = createEnergyStorage(0);
private final LazyOptional<EnergyStorage> energyStorageCap = LazyOptional.of(() -> energyStorage);