From 87f435178301dfc969f9447c41874fab9fb11d04 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Wed, 16 Mar 2016 04:23:02 +0300 Subject: [PATCH] Removed imports in patches. --- .../minecraft/block/BlockOldLeaf.java.patch | 12 ++------ .../net/minecraft/item/ItemShears.java.patch | 14 ++-------- .../net/minecraft/util/Session.java.patch | 28 +++++++------------ .../net/minecraft/world/WorldType.java.patch | 14 ++-------- .../gen/feature/WorldGenBirchTree.java.patch | 18 ++++-------- 5 files changed, 22 insertions(+), 64 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch b/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch index c056b175b3..a9f19415b0 100644 --- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch +++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.java.patch @@ -1,14 +1,6 @@ --- ../src-base/minecraft/net/minecraft/block/BlockOldLeaf.java +++ ../src-work/minecraft/net/minecraft/block/BlockOldLeaf.java -@@ -14,6 +14,7 @@ - import net.minecraft.stats.StatList; - import net.minecraft.tileentity.TileEntity; - import net.minecraft.util.math.BlockPos; -+import net.minecraft.world.IBlockAccess; - import net.minecraft.world.World; - import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; -@@ -103,11 +104,16 @@ +@@ -103,11 +103,16 @@ if (!p_180657_1_.field_72995_K && p_180657_6_ != null && p_180657_6_.func_77973_b() == Items.field_151097_aZ) { p_180657_2_.func_71029_a(StatList.func_188055_a(this)); @@ -21,7 +13,7 @@ } + + @Override -+ public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) ++ public List onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) + { + return java.util.Arrays.asList(new ItemStack(this, 1, world.func_180495_p(pos).func_177229_b(field_176239_P).func_176839_a())); + } diff --git a/patches/minecraft/net/minecraft/item/ItemShears.java.patch b/patches/minecraft/net/minecraft/item/ItemShears.java.patch index 700dd18bd4..3746b62ab7 100644 --- a/patches/minecraft/net/minecraft/item/ItemShears.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemShears.java.patch @@ -1,14 +1,6 @@ --- ../src-base/minecraft/net/minecraft/item/ItemShears.java +++ ../src-work/minecraft/net/minecraft/item/ItemShears.java -@@ -6,6 +6,7 @@ - import net.minecraft.creativetab.CreativeTabs; - import net.minecraft.entity.EntityLivingBase; - import net.minecraft.init.Blocks; -+import net.minecraft.util.EnumHand; - import net.minecraft.util.math.BlockPos; - import net.minecraft.world.World; - -@@ -22,7 +23,7 @@ +@@ -22,7 +22,7 @@ { p_179218_1_.func_77972_a(1, p_179218_5_); Block block = p_179218_3_.func_177230_c(); @@ -17,14 +9,14 @@ } public boolean func_150897_b(IBlockState p_150897_1_) -@@ -36,4 +37,71 @@ +@@ -36,4 +36,71 @@ Block block = p_150893_2_.func_177230_c(); return block != Blocks.field_150321_G && p_150893_2_.func_185904_a() != Material.field_151584_j ? (block == Blocks.field_150325_L ? 5.0F : super.func_150893_a(p_150893_1_, p_150893_2_)) : 15.0F; } + + + @Override -+ public boolean func_111207_a(ItemStack itemstack, net.minecraft.entity.player.EntityPlayer player, EntityLivingBase entity, EnumHand hand) ++ public boolean func_111207_a(ItemStack itemstack, net.minecraft.entity.player.EntityPlayer player, EntityLivingBase entity, net.minecraft.util.EnumHand hand) + { + if (entity.field_70170_p.field_72995_K) + { diff --git a/patches/minecraft/net/minecraft/util/Session.java.patch b/patches/minecraft/net/minecraft/util/Session.java.patch index 6ac3242785..db649de70e 100644 --- a/patches/minecraft/net/minecraft/util/Session.java.patch +++ b/patches/minecraft/net/minecraft/util/Session.java.patch @@ -1,15 +1,6 @@ --- ../src-base/minecraft/net/minecraft/util/Session.java +++ ../src-work/minecraft/net/minecraft/util/Session.java -@@ -5,6 +5,8 @@ - import com.mojang.util.UUIDTypeAdapter; - import java.util.Map; - import java.util.UUID; -+ -+import net.minecraftforge.fml.common.FMLLog; - import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; - -@@ -15,9 +17,24 @@ +@@ -15,9 +15,25 @@ private final String field_148257_b; private final String field_148258_c; private final Session.Type field_152429_d; @@ -22,19 +13,20 @@ + { + p_i1098_1_ = "MissingName"; + p_i1098_2_ = p_i1098_3_ = "NotValid"; -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "========================================================="); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "WARNING!! the username was not set for this session, typically"); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "this means you installed Forge incorrectly. We have set your"); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "name to \"MissingName\" and your session to nothing. Please"); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "check your installation and post a console log from the launcher"); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "when asking for help!"); -+ FMLLog.getLogger().log(org.apache.logging.log4j.Level.WARN, "========================================================="); ++ org.apache.logging.log4j.Logger logger = net.minecraftforge.fml.common.FMLLog.getLogger(); ++ logger.log(org.apache.logging.log4j.Level.WARN, "========================================================="); ++ logger.log(org.apache.logging.log4j.Level.WARN, "WARNING!! the username was not set for this session, typically"); ++ logger.log(org.apache.logging.log4j.Level.WARN, "this means you installed Forge incorrectly. We have set your"); ++ logger.log(org.apache.logging.log4j.Level.WARN, "name to \"MissingName\" and your session to nothing. Please"); ++ logger.log(org.apache.logging.log4j.Level.WARN, "check your installation and post a console log from the launcher"); ++ logger.log(org.apache.logging.log4j.Level.WARN, "when asking for help!"); ++ logger.log(org.apache.logging.log4j.Level.WARN, "========================================================="); + } + this.field_74286_b = p_i1098_1_; this.field_148257_b = p_i1098_2_; this.field_148258_c = p_i1098_3_; -@@ -49,14 +66,29 @@ +@@ -49,14 +65,29 @@ try { UUID uuid = UUIDTypeAdapter.fromString(this.func_148255_b()); diff --git a/patches/minecraft/net/minecraft/world/WorldType.java.patch b/patches/minecraft/net/minecraft/world/WorldType.java.patch index 55e06c22c2..eeb74f3943 100644 --- a/patches/minecraft/net/minecraft/world/WorldType.java.patch +++ b/patches/minecraft/net/minecraft/world/WorldType.java.patch @@ -1,16 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/WorldType.java +++ ../src-work/minecraft/net/minecraft/world/WorldType.java -@@ -1,5 +1,9 @@ - package net.minecraft.world; - -+import net.minecraft.world.chunk.IChunkGenerator; -+import net.minecraft.world.gen.ChunkProviderDebug; -+import net.minecraft.world.gen.ChunkProviderFlat; -+import net.minecraft.world.gen.ChunkProviderOverworld; - import net.minecraftforge.fml.relauncher.Side; - import net.minecraftforge.fml.relauncher.SideOnly; - -@@ -27,6 +31,7 @@ +@@ -27,6 +27,7 @@ private WorldType(int p_i1960_1_, String p_i1960_2_, int p_i1960_3_) { @@ -18,7 +8,7 @@ this.field_77133_f = p_i1960_2_; this.field_77134_g = p_i1960_3_; this.field_77140_h = true; -@@ -113,4 +118,145 @@ +@@ -113,4 +114,145 @@ this.field_151361_l = true; return this; } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java.patch index 0dde48dc2d..77d4b839e8 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java.patch @@ -1,14 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java +++ ../src-work/minecraft/net/minecraft/world/gen/feature/WorldGenBirchTree.java -@@ -8,6 +8,7 @@ - import net.minecraft.block.material.Material; - import net.minecraft.block.state.IBlockState; - import net.minecraft.init.Blocks; -+import net.minecraft.util.EnumFacing; - import net.minecraft.util.math.BlockPos; - import net.minecraft.world.World; - -@@ -56,9 +57,9 @@ +@@ -56,9 +56,9 @@ { for (int i1 = p_180709_3_.func_177952_p() - k; i1 <= p_180709_3_.func_177952_p() + k && flag; ++i1) { @@ -20,14 +12,14 @@ { flag = false; } -@@ -77,11 +78,13 @@ +@@ -77,11 +77,13 @@ } else { - Block block = p_180709_1_.func_180495_p(p_180709_3_.func_177977_b()).func_177230_c(); + BlockPos down = p_180709_3_.func_177977_b(); + IBlockState state = p_180709_1_.func_180495_p(down); -+ boolean isSoil = state.func_177230_c().canSustainPlant(state, p_180709_1_, down, EnumFacing.UP, (net.minecraft.block.BlockSapling)Blocks.field_150345_g); ++ boolean isSoil = state.func_177230_c().canSustainPlant(state, p_180709_1_, down, net.minecraft.util.EnumFacing.UP, (net.minecraft.block.BlockSapling)Blocks.field_150345_g); - if ((block == Blocks.field_150349_c || block == Blocks.field_150346_d || block == Blocks.field_150458_ak) && p_180709_3_.func_177956_o() < 256 - i - 1) + if (isSoil && p_180709_3_.func_177956_o() < p_180709_1_.func_72800_K() - i - 1) @@ -37,7 +29,7 @@ for (int i2 = p_180709_3_.func_177956_o() - 3 + i; i2 <= p_180709_3_.func_177956_o() + i; ++i2) { -@@ -99,9 +102,9 @@ +@@ -99,9 +101,9 @@ if (Math.abs(j1) != l2 || Math.abs(l1) != l2 || p_180709_2_.nextInt(2) != 0 && k2 != 0) { BlockPos blockpos = new BlockPos(i3, i2, k1); @@ -49,7 +41,7 @@ { this.func_175903_a(p_180709_1_, blockpos, field_181630_b); } -@@ -112,9 +115,10 @@ +@@ -112,9 +114,10 @@ for (int j2 = 0; j2 < i; ++j2) {