diff --git a/dependencies.gradle b/dependencies.gradle index 40c0cb9b1..cdb57d15d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,15 +1,14 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.6.30:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev') + api('com.github.GTNewHorizons:GTNHLib:0.6.32:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.43:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.4:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.51-GTNH:dev') - runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.1.54:dev') + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.7:dev') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev') compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.2-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.4-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 800831bd9..8e7911605 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -123,10 +123,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector public static boolean staticDreamwood = false; public static boolean staticUltra = false; - UUID identity; - + UUID identity = UUID.fromString("0d0f407d-1760-4f68-84af-3067c3ed0837"); FakePlayer fakeplayer; - GameProfile profile = new GameProfile(UUID.fromString("0d0f407d-1760-4f68-84af-3067c3ed0837"), "[Botania]"); + GameProfile profile = new GameProfile(identity, "[Botania]"); private static final WeakHashMap> FakePlayers = new WeakHashMap<>(); int mana; @@ -268,10 +267,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector public void writeCustomNBT(NBTTagCompound cmp) { super.writeCustomNBT(cmp); - UUID identity = getIdentifier(); - cmp.setBoolean(TAG_HAS_IDENTITY, true); - cmp.setLong(TAG_UUID_MOST, identity.getMostSignificantBits()); - cmp.setLong(TAG_UUID_LEAST, identity.getLeastSignificantBits()); + cmp.setInteger(TAG_MANA, mana); cmp.setFloat(TAG_ROTATION_X, rotationX); @@ -307,13 +303,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector public void readCustomNBT(NBTTagCompound cmp) { super.readCustomNBT(cmp); - if(cmp.getBoolean(TAG_HAS_IDENTITY)) { - long most = cmp.getLong(TAG_UUID_MOST); - long least = cmp.getLong(TAG_UUID_LEAST); - UUID identity = getIdentifierUnsafe(); - if(identity == null || most != identity.getMostSignificantBits() || least != identity.getLeastSignificantBits()) - identity = new UUID(most, least); - } else getIdentifier(); mana = cmp.getInteger(TAG_MANA); rotationX = cmp.getFloat(TAG_ROTATION_X); @@ -764,8 +753,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector @Override public UUID getIdentifier() { - if(identity == null) - identity = UUID.randomUUID(); return identity; } public void setFakeplayer(){ @@ -779,8 +766,4 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector } } - public UUID getIdentifierUnsafe() { - return identity; - } - } diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemHelper.java index e28e55cd2..9a5874237 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemHelper.java @@ -2,13 +2,11 @@ package vazkii.botania.common.core.helper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; import net.minecraftforge.event.world.BlockEvent; -import java.util.List; public class ItemHelper { public static boolean canPlaceBlock(World world, int x, int y, int z, int xAt, int yAt, int zAt, EntityPlayer player){ @@ -21,11 +19,7 @@ public class ItemHelper { return !event.isCanceled(); } -// public static boolean canPlaceMultiBLock(World world, List list, int xAt, int yAt, int zAt, EntityPlayer player){ -// -// Block block = world.getBlock(xAt,yAt ,zAt); -// BlockEvent.MultiPlaceEvent event = new BlockEvent.MultiPlaceEvent(blocksnapshots,block,player); -// } + public static boolean canBreakBlock(World world,int x, int y, int z,EntityPlayer player){ Block block = world.getBlock(x,y,z); int meta = world.getBlockMetadata(x,y,z);