Organise imports

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-03-09 08:47:33 +11:00
parent 1ae7bcc4d0
commit b2efd58164
188 changed files with 879 additions and 825 deletions

View File

@@ -1,14 +1,14 @@
--- a/net/minecraft/server/BlockComposter.java
+++ b/net/minecraft/server/BlockComposter.java
@@ -4,13 +4,17 @@
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
@@ -5,12 +5,17 @@
import java.util.Random;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.inventory.CraftBlockInventoryHolder;
+import org.bukkit.craftbukkit.util.DummyGeneratorAccess;
+// CraftBukkit end
+
public class BlockComposter extends Block implements IInventoryHolder {
public static final BlockStateInteger a = BlockProperties.as;
@@ -19,7 +19,7 @@
for (int i = 0; i < 8; ++i) {
avoxelshape[i] = VoxelShapes.a(BlockComposter.c, Block.a(2.0D, (double) Math.max(2, 1 + i * 2), 2.0D, 14.0D, 16.0D, 14.0D), OperatorBoolean.ONLY_FIRST);
}
@@ -156,18 +160,25 @@
@@ -156,18 +161,25 @@
return EnumInteractionResult.a(world.isClientSide);
} else if (i == 8) {
@@ -48,7 +48,7 @@
itemstack.subtract(1);
return iblockdata1;
@@ -176,7 +187,15 @@
@@ -176,7 +188,15 @@
}
}
@@ -65,7 +65,7 @@
if (!world.isClientSide) {
float f = 0.7F;
double d0 = (double) (world.random.nextFloat() * 0.7F) + 0.15000000596046448D;
@@ -202,10 +221,16 @@
@@ -202,10 +222,16 @@
}
private static IBlockData b(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition, ItemStack itemstack) {
@@ -83,7 +83,7 @@
return iblockdata;
} else {
int j = i + 1;
@@ -253,7 +278,8 @@
@@ -253,7 +279,8 @@
public IWorldInventory a(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
int i = (Integer) iblockdata.get(BlockComposter.a);
@@ -93,7 +93,7 @@
}
static class ContainerInput extends InventorySubcontainer implements IWorldInventory {
@@ -265,6 +291,7 @@
@@ -265,6 +292,7 @@
public ContainerInput(IBlockData iblockdata, GeneratorAccess generatoraccess, BlockPosition blockposition) {
super(1);
@@ -101,7 +101,7 @@
this.a = iblockdata;
this.b = generatoraccess;
this.c = blockposition;
@@ -317,6 +344,7 @@
@@ -317,6 +345,7 @@
this.blockData = iblockdata;
this.generatorAccess = generatoraccess;
this.blockPosition = blockposition;
@@ -109,7 +109,7 @@
}
@Override
@@ -341,15 +369,23 @@
@@ -341,15 +370,23 @@
@Override
public void update() {