Commit Changes Up-Stream?

.directory

@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2020,4,16,16,4,7
+Version=3

.gitignore

@@ -0,0 +1,22 @@
+# eclipse
+bin
+*.launch
+.settings
+.metadata
+.classpath
+.project
+
+# idea
+out
+*.ipr
+*.iws
+*.iml
+.idea
+
+# gradle
+build
+.gradle
+
+# other
+eclipse
+run

CREDITS-fml.txt

@@ -0,0 +1,28 @@
+This is Forge Mod Loader.
+
+You can find the source code at all times at https://github.com/MinecraftForge/FML
+
+This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
+and minecraft clients.
+
+The code is authored by cpw.
+
+It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
+http://www.minecraftforum.net/topic/75440-
+This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.
+
+It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
+http://www.minecraftforge.net/
+
+Additionally, it contains an implementation of topological sort based on that 
+published at http://keithschwarz.com/interesting/code/?dir=topological-sort
+
+It also contains code from the Maven project for performing versioned dependency
+resolution. http://maven.apache.org/
+
+It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
+with credit to it's authors.
+
+Forge Mod Loader downloads components from the Minecraft Coder Pack
+(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.
+

MinecraftForge-Credits.txt

@@ -0,0 +1,26 @@
+* Eloraam *
+
+* FlowerChild *
+
+* Hawkye *
+
+* MALfunction84 *
+
+Submitted the sleep handler code for his mod (Somnia) and others to use.
+
+* Scokeev9 *
+
+Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
+
+ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
+
+* SpaceToad *
+
+* LexManos *
+
+* cpw *
+
+* Minecraft Coder Pack (MCP) *
+Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files.
+This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or
+remove the MCP data files and request their users to download MCP separately.

java/com/gw/dm/ClientProxy.java → Old/java/com/gw/dm/ClientProxy.java

@@ -1,5 +1,7 @@
 package com.gw.dm;
 
+import net.minecraftforge.fml.client.registry.RenderingRegistry;
+
 import com.gw.dm.entity.EntityAhriman;
 import com.gw.dm.entity.EntityBeamos;
 import com.gw.dm.entity.EntityBladeTrap;
@@ -70,8 +72,6 @@
 import com.gw.dm.render.RenderUmberHulk;
 import com.gw.dm.render.RenderVescavor;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class ClientProxy extends CommonProxy 
 {
 	public void registerRenders()

java/com/gw/dm/DungeonMobs.java → Old/java/com/gw/dm/DungeonMobs.java

@@ -19,14 +19,26 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.potion.Potion;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
+import net.minecraft.world.biome.Biome.SpawnListEntry;
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeDictionary.Type;
 import net.minecraftforge.common.DungeonHooks;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.Mod.Instance;
+import net.minecraftforge.fml.common.ModMetadata;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.registry.EntityRegistry;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import com.gw.dm.blocks.BlockBladeTrap;
 import com.gw.dm.blocks.BlockLavarock;
@@ -60,20 +72,6 @@
 import com.gw.dm.projectile.EntityMagicMissile;
 import com.gw.dm.projectile.EntitySonicBoom;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.registry.EntityRegistry;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 @Mod(modid=DungeonMobs.MODID, name="Dungeon Mobs", version=DungeonMobs.VERSION)
 public class DungeonMobs 
 {

java/com/gw/dm/DungeonMobsEventHandler.java → Old/java/com/gw/dm/DungeonMobsEventHandler.java

@@ -5,24 +5,15 @@
 import java.net.URL;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityClientPlayerMP;
-import net.minecraft.event.ClickEvent;
-import net.minecraft.network.play.client.C01PacketChatMessage;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.ChatStyle;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent;
-import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.util.text.event.ClickEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class DungeonMobsEventHandler
-{
+{		
 	@SideOnly(Side.CLIENT)
 	@SubscribeEvent
 	public void doStuff(ClientTickEvent event)

java/com/gw/dm/DungeonMobsHelper.java → Old/java/com/gw/dm/DungeonMobsHelper.java

@@ -2,11 +2,10 @@
 
 import java.util.LinkedList;
 
-import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
@@ -18,7 +17,7 @@
 //import cpw.mods.fml.common.network.Player;
 
 public class DungeonMobsHelper 
-{
+{	
 	//private static Item[] modItems;
 	//private static Class[] modEntities;
 

java/com/gw/dm/DungeonMobsWorldGenEvent.java → Old/java/com/gw/dm/DungeonMobsWorldGenEvent.java

@@ -2,22 +2,19 @@
 
 import java.util.Random;
 
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
-import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 //import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.terraingen.PopulateChunkEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 public class DungeonMobsWorldGenEvent
 {
 	//private WorldGenBladeTraps bladeTrapGen = new WorldGenBladeTraps();
-
+		
 	/*
 	@Override
 	public void generate(Random random, int chunkX, int chunkZ, World world,

java/com/gw/dm/EntityDungeonFlying.java → Old/java/com/gw/dm/EntityDungeonFlying.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.entity.EntityFlying;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.World;
 
@@ -13,11 +13,11 @@ public class EntityDungeonFlying extends EntityFlying
 
 	public EntityDungeonFlying(World par1World) 
 	{
-		super(par1World);
+		super(par1World);	
 		//this.spawnChecked = !DungeonMobsHelper.getMSC();
 	}
 
-	/*
+	/*	
 	@Override
 	public int getMaxHealth() 
 	{

java/com/gw/dm/ai/EntityAIAttackAnythingWanted.java → Old/java/com/gw/dm/ai/EntityAIAttackAnythingWanted.java

@@ -10,17 +10,12 @@
  * Do not redistribute without permission.
  */
 
-import com.gw.dm.entity.EntityRustMonster;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIAttackOnCollide;
-import net.minecraft.pathfinding.PathEntity;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import com.gw.dm.entity.EntityRustMonster;
+
 public class EntityAIAttackAnythingWanted extends EntityAIAttackOnCollide 
 {
 	World worldObj;

java/com/gw/dm/ai/EntityAIFindItem.java → Old/java/com/gw/dm/ai/EntityAIFindItem.java

@@ -17,8 +17,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import com.gw.dm.entity.EntityRustMonster;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,6 +30,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import com.gw.dm.entity.EntityRustMonster;
+
 public class EntityAIFindItem extends EntityAIBase
 {
 	private Entity targetEntity;

java/com/gw/dm/ai/EntityAIFollowTwin.java → Old/java/com/gw/dm/ai/EntityAIFollowTwin.java

@@ -1,9 +1,8 @@
 package com.gw.dm.ai;
 
-import com.gw.dm.entity.EntityLizalfos;
-
 import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.passive.EntityAnimal;
+
+import com.gw.dm.entity.EntityLizalfos;
 
 public class EntityAIFollowTwin extends EntityAIBase 
 {

java/com/gw/dm/ai/EntityAIMonsterPanic.java → Old/java/com/gw/dm/ai/EntityAIMonsterPanic.java

@@ -3,7 +3,6 @@
 import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.ai.RandomPositionGenerator;
 import net.minecraft.entity.monster.EntityMob;
-import net.minecraft.util.Vec3;
 
 public class EntityAIMonsterPanic extends EntityAIBase
 {

java/com/gw/dm/blocks/BlockBladeTrap.java → Old/java/com/gw/dm/blocks/BlockBladeTrap.java

@@ -14,8 +14,8 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;

java/com/gw/dm/blocks/BlockLavarock.java → Old/java/com/gw/dm/blocks/BlockLavarock.java

@@ -2,21 +2,18 @@
 
 import java.util.Random;
 
-import com.gw.dm.DungeonMobsHelper;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 //import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.DamageSource;
+import net.minecraft.util.math.AxisAlignedBB;
 //import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 
+import com.gw.dm.DungeonMobsHelper;
+
 public class BlockLavarock extends Block
 {
 	public BlockLavarock(Material par2Material) 

java/com/gw/dm/blocks/TileEntityBeamos.java → Old/java/com/gw/dm/blocks/TileEntityBeamos.java

@@ -8,8 +8,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Vec3;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 

java/com/gw/dm/blocks/TileEntityBladeTrap.java → Old/java/com/gw/dm/blocks/TileEntityBladeTrap.java

@@ -5,18 +5,17 @@
 import java.util.List;
 import java.util.Random;
 
-import com.gw.dm.DungeonMobs;
-
-import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraft.world.World;
 
+import com.gw.dm.DungeonMobs;
+
 public class TileEntityBladeTrap extends TileEntity
 {
 	private int spawnTicks = 0;