diff --git a/client/net/minecraftforge/client/ModCompatibilityClient.java b/client/net/minecraftforge/client/ModCompatibilityClient.java index 94b87b0e86..d3203d6ce0 100644 --- a/client/net/minecraftforge/client/ModCompatibilityClient.java +++ b/client/net/minecraftforge/client/ModCompatibilityClient.java @@ -12,7 +12,13 @@ import paulscode.sound.SoundSystemConfig; import paulscode.sound.codecs.CodecIBXM; import net.minecraft.client.Minecraft; -import net.minecraft.src.*; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPool; +import net.minecraft.client.audio.SoundPoolEntry; +import net.minecraft.entity.Entity; +import net.minecraft.network.packet.Packet100OpenWindow; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; public class ModCompatibilityClient { diff --git a/common/net/minecraftforge/common/ChestGenHooks.java b/common/net/minecraftforge/common/ChestGenHooks.java index 75475f62cc..af480b6b60 100644 --- a/common/net/minecraftforge/common/ChestGenHooks.java +++ b/common/net/minecraftforge/common/ChestGenHooks.java @@ -2,7 +2,10 @@ package net.minecraftforge.common; import java.util.*; -import net.minecraft.src.*; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandomChestContent; +import net.minecraft.world.WorldServer; +import net.minecraft.world.gen.structure.*; public class ChestGenHooks { diff --git a/common/net/minecraftforge/common/DimensionManager.java b/common/net/minecraftforge/common/DimensionManager.java index 2b0adde6e9..7c2c21dcc9 100644 --- a/common/net/minecraftforge/common/DimensionManager.java +++ b/common/net/minecraftforge/common/DimensionManager.java @@ -15,8 +15,20 @@ import com.google.common.collect.Maps; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.*; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.MinecraftException; +import net.minecraft.world.World; +import net.minecraft.world.WorldManager; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.WorldProviderEnd; +import net.minecraft.world.WorldProviderHell; +import net.minecraft.world.WorldProviderSurface; +import net.minecraft.world.WorldServer; +import net.minecraft.world.WorldServerMulti; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.storage.ISaveHandler; import net.minecraftforge.event.world.WorldEvent; public class DimensionManager diff --git a/common/net/minecraftforge/common/EnumHelper.java b/common/net/minecraftforge/common/EnumHelper.java index b810c46303..68a30a6974 100644 --- a/common/net/minecraftforge/common/EnumHelper.java +++ b/common/net/minecraftforge/common/EnumHelper.java @@ -1,9 +1,23 @@ package net.minecraftforge.common; -import net.minecraft.src.*; import java.lang.reflect.*; import java.util.*; +import net.minecraft.block.EnumMobType; +import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.EnumEntitySize; +import net.minecraft.entity.player.EnumStatus; +import net.minecraft.item.EnumAction; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.EnumToolMaterial; +import net.minecraft.util.EnumArt; +import net.minecraft.util.EnumMovingObjectType; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.gen.structure.EnumDoor; + public class EnumHelper { private static Object reflectionFactory = null; diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index 2273b5a5e6..b493325ff2 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -9,7 +9,22 @@ import com.google.common.collect.ListMultimap; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; -import net.minecraft.src.*; +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumMovingObjectType; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.WeightedRandom; +import net.minecraft.util.WeightedRandomItem; +import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.*; diff --git a/common/net/minecraftforge/common/ForgeInternalHandler.java b/common/net/minecraftforge/common/ForgeInternalHandler.java index f95da0f987..cf7cd24637 100644 --- a/common/net/minecraftforge/common/ForgeInternalHandler.java +++ b/common/net/minecraftforge/common/ForgeInternalHandler.java @@ -4,7 +4,10 @@ import java.util.UUID; import cpw.mods.fml.common.FMLLog; -import net.minecraft.src.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.event.*; import net.minecraftforge.event.entity.*; import net.minecraftforge.event.world.WorldEvent; diff --git a/common/net/minecraftforge/common/MinecraftForge.java b/common/net/minecraftforge/common/MinecraftForge.java index 7d26c340d1..4d6e2c70bd 100644 --- a/common/net/minecraftforge/common/MinecraftForge.java +++ b/common/net/minecraftforge/common/MinecraftForge.java @@ -8,7 +8,11 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.ModContainer; -import net.minecraft.src.*; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks.GrassEntry; import net.minecraftforge.common.ForgeHooks.SeedEntry; import net.minecraftforge.event.EventBus; diff --git a/common/net/minecraftforge/event/ForgeEventFactory.java b/common/net/minecraftforge/event/ForgeEventFactory.java index d170ab2812..34dfacd1ed 100644 --- a/common/net/minecraftforge/event/ForgeEventFactory.java +++ b/common/net/minecraftforge/event/ForgeEventFactory.java @@ -1,5 +1,8 @@ package net.minecraftforge.event; -import net.minecraft.src.*; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.*; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; diff --git a/common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java b/common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java index 5fec2d063d..395c1b3bab 100644 --- a/common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java +++ b/common/net/minecraftforge/event/entity/player/PlayerDropsEvent.java @@ -2,7 +2,10 @@ package net.minecraftforge.event.entity.player; import java.util.ArrayList; -import net.minecraft.src.*; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.DamageSource; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.living.LivingDropsEvent; diff --git a/common/net/minecraftforge/event/terraingen/BiomeEvent.java b/common/net/minecraftforge/event/terraingen/BiomeEvent.java index da1e094225..a91945820b 100644 --- a/common/net/minecraftforge/event/terraingen/BiomeEvent.java +++ b/common/net/minecraftforge/event/terraingen/BiomeEvent.java @@ -2,7 +2,9 @@ package net.minecraftforge.event.terraingen; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import net.minecraft.src.*; + +import net.minecraft.world.biome.BiomeDecorator; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.*; public class BiomeEvent extends Event diff --git a/common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java b/common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java index bb5d02a0d6..7e8d51d860 100644 --- a/common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java +++ b/common/net/minecraftforge/event/terraingen/ChunkProviderEvent.java @@ -1,6 +1,7 @@ package net.minecraftforge.event.terraingen; -import net.minecraft.src.*; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.event.*; public class ChunkProviderEvent extends Event diff --git a/common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java b/common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java index c496d339ed..af9d6cfed2 100644 --- a/common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java +++ b/common/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java @@ -2,7 +2,7 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; +import net.minecraft.world.World; import net.minecraftforge.event.*; public class DecorateBiomeEvent extends Event diff --git a/common/net/minecraftforge/event/terraingen/InitMapGenEvent.java b/common/net/minecraftforge/event/terraingen/InitMapGenEvent.java index 9335194de2..2aab3eae49 100644 --- a/common/net/minecraftforge/event/terraingen/InitMapGenEvent.java +++ b/common/net/minecraftforge/event/terraingen/InitMapGenEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.terraingen; -import net.minecraft.src.*; +import net.minecraft.world.gen.MapGenBase; import net.minecraftforge.event.*; public class InitMapGenEvent extends Event diff --git a/common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java b/common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java index 0f639fd7b0..d94c57fe0e 100644 --- a/common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java +++ b/common/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java @@ -2,7 +2,8 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; +import net.minecraft.world.World; +import net.minecraft.world.gen.NoiseGeneratorOctaves; import net.minecraftforge.event.world.*; public class InitNoiseGensEvent extends WorldEvent diff --git a/common/net/minecraftforge/event/terraingen/OreGenEvent.java b/common/net/minecraftforge/event/terraingen/OreGenEvent.java index 4b358ab0d8..7d98351803 100644 --- a/common/net/minecraftforge/event/terraingen/OreGenEvent.java +++ b/common/net/minecraftforge/event/terraingen/OreGenEvent.java @@ -2,7 +2,8 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.event.*; public class OreGenEvent extends Event diff --git a/common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java b/common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java index d3cb55f6fa..f0faf89ca2 100644 --- a/common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java +++ b/common/net/minecraftforge/event/terraingen/PopulateChunkEvent.java @@ -2,7 +2,8 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.event.world.*; public class PopulateChunkEvent extends ChunkProviderEvent diff --git a/common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java b/common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java index e0d6d4c44b..668fc29684 100644 --- a/common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java +++ b/common/net/minecraftforge/event/terraingen/SaplingGrowTreeEvent.java @@ -2,9 +2,9 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; -import net.minecraftforge.event.Event.*; -import net.minecraftforge.event.world.*; +import net.minecraft.world.World; +import net.minecraftforge.event.Event.HasResult; +import net.minecraftforge.event.world.WorldEvent; /** * This event is fired when a sapling grows a tree. diff --git a/common/net/minecraftforge/event/terraingen/TerrainGen.java b/common/net/minecraftforge/event/terraingen/TerrainGen.java index 972c8d58ad..8b86d01a8d 100644 --- a/common/net/minecraftforge/event/terraingen/TerrainGen.java +++ b/common/net/minecraftforge/event/terraingen/TerrainGen.java @@ -2,7 +2,11 @@ package net.minecraftforge.event.terraingen; import java.util.Random; -import net.minecraft.src.*; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.MapGenBase; +import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.*; import net.minecraftforge.event.Event.*; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.*; diff --git a/common/net/minecraftforge/oredict/OreDictionary.java b/common/net/minecraftforge/oredict/OreDictionary.java index a93875bb4e..e6438e9d19 100644 --- a/common/net/minecraftforge/oredict/OreDictionary.java +++ b/common/net/minecraftforge/oredict/OreDictionary.java @@ -7,7 +7,13 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.src.*; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event;