From acb7acd6610a1b4d61da60ba09c35b86bb5c6d36 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 16 Nov 2018 23:19:04 -0800 Subject: [PATCH] Fix imports, remember to re-run gen patches! --- .../net/minecraft/block/Block.java.patch | 34 ++++++++----------- .../net/minecraft/block/BlockCrops.java.patch | 16 +++------ .../minecraft/block/BlockLadder.java.patch | 20 ++--------- .../minecraft/block/BlockLeaves.java.patch | 25 +++----------- .../block/BlockMobSpawner.java.patch | 10 ++---- .../BlockShearableDoublePlant.java.patch | 16 +++------ 6 files changed, 32 insertions(+), 89 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 633ea725f8..a9f53aae18 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -1,12 +1,6 @@ --- a/net/minecraft/block/Block.java +++ b/net/minecraft/block/Block.java -@@ -71,14 +71,19 @@ - import net.minecraft.world.World; - import net.minecraftforge.api.distmarker.Dist; - import net.minecraftforge.api.distmarker.OnlyIn; -+import net.minecraftforge.common.EnumPlantType; -+import net.minecraftforge.common.IPlantable; -+ +@@ -74,11 +74,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -23,7 +17,7 @@ protected final int field_149784_t; protected final float field_149782_v; protected final float field_149781_w; -@@ -316,7 +321,7 @@ +@@ -316,7 +318,7 @@ @Deprecated public boolean func_196253_a(IBlockState p_196253_1_, BlockItemUseContext p_196253_2_) { @@ -32,7 +26,7 @@ } @Deprecated -@@ -328,8 +333,9 @@ +@@ -328,8 +330,9 @@ return this.field_149789_z; } @@ -43,7 +37,7 @@ } @Deprecated -@@ -340,11 +346,11 @@ +@@ -340,11 +343,11 @@ @Deprecated @OnlyIn(Dist.CLIENT) public int func_185484_c(IBlockState p_185484_1_, IWorldReader p_185484_2_, BlockPos p_185484_3_) { @@ -57,7 +51,7 @@ } else { return i; } -@@ -486,8 +492,12 @@ +@@ -486,8 +489,12 @@ @Deprecated public void func_196243_a(IBlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, IBlockState p_196243_4_, boolean p_196243_5_) { @@ -70,7 +64,7 @@ public int func_196264_a(IBlockState p_196264_1_, Random p_196264_2_) { return 1; } -@@ -502,30 +512,27 @@ +@@ -502,30 +509,27 @@ if (f == -1.0F) { return 0.0F; } else { @@ -113,7 +107,7 @@ float f = 0.5F; double d0 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D; double d1 = (double)(p_180635_0_.field_73012_v.nextFloat() * 0.5F) + 0.25D; -@@ -547,6 +554,7 @@ +@@ -547,6 +551,7 @@ } @@ -121,7 +115,7 @@ public float func_149638_a() { return this.field_149781_w; } -@@ -615,16 +623,22 @@ +@@ -615,16 +620,22 @@ public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) { p_180657_2_.func_71029_a(StatList.field_188065_ae.func_199076_b(this)); p_180657_2_.func_71020_j(0.005F); @@ -146,7 +140,7 @@ protected boolean func_149700_E() { return this.func_176223_P().func_185917_h() && !this.func_149716_u(); } -@@ -681,6 +695,7 @@ +@@ -681,6 +692,7 @@ p_176216_2_.field_70181_x = 0.0D; } @@ -154,7 +148,7 @@ public ItemStack func_185473_a(IBlockReader p_185473_1_, BlockPos p_185473_2_, IBlockState p_185473_3_) { return new ItemStack(this); } -@@ -755,6 +770,7 @@ +@@ -755,6 +767,7 @@ } } @@ -162,7 +156,7 @@ public SoundType func_185467_w() { return this.field_149762_H; } -@@ -1147,7 +1163,7 @@ +@@ -1147,7 +1160,7 @@ func_196254_a("chiseled_quartz_block", new Block(Block.Builder.func_200949_a(Material.field_151576_e, MapColor.field_151677_p).func_200943_b(0.8F))); func_196254_a("quartz_pillar", new BlockRotatedPillar(Block.Builder.func_200949_a(Material.field_151576_e, MapColor.field_151677_p).func_200943_b(0.8F))); func_196254_a("quartz_stairs", new BlockStairs(block42.func_176223_P(), Block.Builder.func_200950_a(block42))); @@ -171,7 +165,7 @@ func_196254_a("dropper", new BlockDropper(Block.Builder.func_200945_a(Material.field_151576_e).func_200943_b(3.5F))); func_196254_a("white_terracotta", new Block(Block.Builder.func_200949_a(Material.field_151576_e, MapColor.field_193561_M).func_200948_a(1.25F, 4.2F))); func_196254_a("orange_terracotta", new Block(Block.Builder.func_200949_a(Material.field_151576_e, MapColor.field_193562_N).func_200948_a(1.25F, 4.2F))); -@@ -1604,4 +1620,83 @@ +@@ -1604,4 +1617,83 @@ return Objects.hash(this.field_212164_a, this.field_212165_b, this.field_212166_c); } } @@ -216,9 +210,9 @@ + } + + @Override -+ public boolean canSustainPlant(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing, IPlantable plantable) { ++ public boolean canSustainPlant(IBlockState state, IBlockReader world, BlockPos pos, EnumFacing facing, net.minecraftforge.common.IPlantable plantable) { + IBlockState plant = plantable.getPlant(world, pos.func_177972_a(facing)); -+ EnumPlantType type = plantable.getPlantType(world, pos.func_177972_a(facing)); ++ net.minecraftforge.common.EnumPlantType type = plantable.getPlantType(world, pos.func_177972_a(facing)); + + if (plant.func_177230_c() == Blocks.field_150434_aF) + return this.getBlock() == Blocks.field_150434_aF || this.getBlock() == Blocks.field_150354_m || this.getBlock() == Blocks.field_196611_F; diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch index 3e084ec777..56726457b4 100644 --- a/patches/minecraft/net/minecraft/block/BlockCrops.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockCrops.java.patch @@ -1,14 +1,6 @@ --- a/net/minecraft/block/BlockCrops.java +++ b/net/minecraft/block/BlockCrops.java -@@ -9,6 +9,7 @@ - import net.minecraft.state.StateContainer; - import net.minecraft.state.properties.BlockStateProperties; - import net.minecraft.util.IItemProvider; -+import net.minecraft.util.NonNullList; - import net.minecraft.util.math.BlockPos; - import net.minecraft.util.math.MathHelper; - import net.minecraft.util.math.shapes.VoxelShape; -@@ -55,12 +56,14 @@ +@@ -55,12 +55,14 @@ public void func_196267_b(IBlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) { super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_); @@ -24,7 +16,7 @@ } } } -@@ -89,9 +92,9 @@ +@@ -89,9 +91,9 @@ for(int j = -1; j <= 1; ++j) { float f1 = 0.0F; IBlockState iblockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j)); @@ -36,7 +28,7 @@ f1 = 3.0F; } } -@@ -135,15 +138,19 @@ +@@ -135,15 +137,19 @@ } public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) { @@ -47,7 +39,7 @@ + } + + @Override -+ public void getDrops(IBlockState state, NonNullList drops, World world, BlockPos pos, int fortune) { ++ public void getDrops(IBlockState state, net.minecraft.util.NonNullList drops, World world, BlockPos pos, int fortune) { + { + int i = this.func_185527_x(state); if (i >= this.func_185526_g()) { diff --git a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch index 02ea1bb2aa..662f85e821 100644 --- a/patches/minecraft/net/minecraft/block/BlockLadder.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLadder.java.patch @@ -1,28 +1,12 @@ --- a/net/minecraft/block/BlockLadder.java +++ b/net/minecraft/block/BlockLadder.java -@@ -3,6 +3,7 @@ - import javax.annotation.Nullable; - import net.minecraft.block.state.BlockFaceShape; - import net.minecraft.block.state.IBlockState; -+import net.minecraft.entity.EntityLivingBase; - import net.minecraft.fluid.Fluid; - import net.minecraft.fluid.IFluidState; - import net.minecraft.init.Blocks; -@@ -20,6 +21,7 @@ - import net.minecraft.util.math.shapes.VoxelShape; - import net.minecraft.world.IBlockReader; - import net.minecraft.world.IWorld; -+import net.minecraft.world.IWorldReader; - import net.minecraft.world.IWorldReaderBase; - - public class BlockLadder extends Block implements IBucketPickupHandler, ILiquidContainer { -@@ -151,4 +153,9 @@ +@@ -151,4 +151,9 @@ return false; } } + + @Override -+ public boolean isLadder(IBlockState state, IWorldReader world, BlockPos pos, EntityLivingBase entity) { ++ public boolean isLadder(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, net.minecraft.entity.EntityLivingBase entity) { + return true; + } } diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch index 95b0156054..a7f86cbcb3 100644 --- a/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.java.patch @@ -1,21 +1,6 @@ --- a/net/minecraft/block/BlockLeaves.java +++ b/net/minecraft/block/BlockLeaves.java -@@ -1,6 +1,9 @@ - package net.minecraft.block; - -+import java.util.List; - import java.util.Random; -+ -+import javax.annotation.Nonnull; - import javax.annotation.Nullable; - import net.minecraft.block.state.IBlockState; - import net.minecraft.entity.player.EntityPlayer; -@@ -22,11 +25,12 @@ - import net.minecraft.util.math.BlockPos; - import net.minecraft.world.IBlockReader; - import net.minecraft.world.IWorld; -+import net.minecraft.world.IWorldReader; - import net.minecraft.world.World; +@@ -26,7 +26,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -24,7 +9,7 @@ public static final IntegerProperty field_208494_a = BlockStateProperties.field_208514_aa; public static final BooleanProperty field_208495_b = BlockStateProperties.field_208515_s; protected static boolean field_196478_c; -@@ -122,28 +126,37 @@ +@@ -122,28 +122,37 @@ } public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) { @@ -71,7 +56,7 @@ } } -@@ -173,13 +186,7 @@ +@@ -173,13 +182,7 @@ } public void func_180657_a(World p_180657_1_, EntityPlayer p_180657_2_, BlockPos p_180657_3_, IBlockState p_180657_4_, @Nullable TileEntity p_180657_5_, ItemStack p_180657_6_) { @@ -85,13 +70,13 @@ } protected void func_206840_a(StateContainer.Builder p_206840_1_) { -@@ -189,4 +196,9 @@ +@@ -189,4 +192,9 @@ public IBlockState func_196258_a(BlockItemUseContext p_196258_1_) { return func_208493_b((IBlockState)this.func_176223_P().func_206870_a(field_208495_b, Boolean.valueOf(true)), p_196258_1_.func_195991_k(), p_196258_1_.func_195995_a()); } + + @Override -+ public List onSheared(@Nonnull ItemStack item, IWorldReader world, BlockPos pos, int fortune) { ++ public java.util.List onSheared(@javax.annotation.Nonnull ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) { + return java.util.Arrays.asList(new ItemStack(this)); + } } diff --git a/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch b/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch index 41e4ae4a45..2786613bed 100644 --- a/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockMobSpawner.java.patch @@ -1,10 +1,6 @@ --- a/net/minecraft/block/BlockMobSpawner.java +++ b/net/minecraft/block/BlockMobSpawner.java -@@ -10,9 +10,12 @@ - import net.minecraft.util.IItemProvider; - import net.minecraft.util.math.BlockPos; - import net.minecraft.world.IBlockReader; -+import net.minecraft.world.IWorldReader; +@@ -13,6 +13,8 @@ import net.minecraft.world.World; public class BlockMobSpawner extends BlockContainer { @@ -13,7 +9,7 @@ protected BlockMobSpawner(Block.Builder p_i48364_1_) { super(p_i48364_1_); } -@@ -27,10 +30,13 @@ +@@ -27,10 +29,13 @@ public void func_196255_a(IBlockState p_196255_1_, World p_196255_2_, BlockPos p_196255_3_, float p_196255_4_, int p_196255_5_) { super.func_196255_a(p_196255_1_, p_196255_2_, p_196255_3_, p_196255_4_, p_196255_5_); @@ -22,7 +18,7 @@ } + @Override -+ public int getExpDrop(IBlockState state, IWorldReader world, BlockPos pos, int fortune) { ++ public int getExpDrop(IBlockState state, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) { + return 15 + RAND.nextInt(15) + RAND.nextInt(15); + } + diff --git a/patches/minecraft/net/minecraft/block/BlockShearableDoublePlant.java.patch b/patches/minecraft/net/minecraft/block/BlockShearableDoublePlant.java.patch index 6606d747ab..bb23f5295a 100644 --- a/patches/minecraft/net/minecraft/block/BlockShearableDoublePlant.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockShearableDoublePlant.java.patch @@ -1,14 +1,6 @@ --- a/net/minecraft/block/BlockShearableDoublePlant.java +++ b/net/minecraft/block/BlockShearableDoublePlant.java -@@ -1,5 +1,7 @@ - package net.minecraft.block; - -+import java.util.List; -+ - import net.minecraft.block.state.IBlockState; - import net.minecraft.init.Blocks; - import net.minecraft.init.Items; -@@ -11,7 +13,7 @@ +@@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -17,7 +9,7 @@ public static final EnumProperty field_208063_b = BlockDoublePlant.field_176492_b; private final Block field_196392_b; -@@ -26,9 +28,7 @@ +@@ -26,9 +26,7 @@ } protected void func_196391_a(IBlockState p_196391_1_, World p_196391_2_, BlockPos p_196391_3_, ItemStack p_196391_4_) { @@ -28,7 +20,7 @@ super.func_196391_a(p_196391_1_, p_196391_2_, p_196391_3_, p_196391_4_); } -@@ -37,4 +37,14 @@ +@@ -37,4 +35,14 @@ public IItemProvider func_199769_a(IBlockState p_199769_1_, World p_199769_2_, BlockPos p_199769_3_, int p_199769_4_) { return p_199769_1_.func_177229_b(field_208063_b) == DoubleBlockHalf.LOWER && this == Blocks.field_196804_gh && p_199769_2_.field_73012_v.nextInt(8) == 0 ? Items.field_151014_N : Items.field_190931_a; } @@ -39,7 +31,7 @@ + } + + @Override -+ public List onSheared(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) { ++ public java.util.List onSheared(ItemStack item, net.minecraft.world.IWorldReader world, BlockPos pos, int fortune) { + return java.util.Arrays.asList(new ItemStack(this.field_196392_b, 2)); + } }