keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Update bukkit with new mod fixes

Browse source
This commit is contained in:
Christian Weeks 2012-04-18 14:06:54 -04:00
parent ac779739aa
commit c4ad78ab87
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fml/bukkit/cpw/mods/fml/server/FMLBukkitHandler.java
View file

@ -184,11 +184,11 @@ public class FMLBukkitHandler implements IFMLSidedHandler
/** /**
* Load the supplied mod class into a mod container * Load the supplied mod class into a mod container
*/ */
public ModContainer loadBaseModMod(Class<?> clazz, String canonicalPath) public ModContainer loadBaseModMod(Class<?> clazz, File canonicalFile)
{ {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Class <? extends BaseMod > bmClazz = (Class <? extends BaseMod >) clazz; Class <? extends BaseMod > bmClazz = (Class <? extends BaseMod >) clazz;
return new ModLoaderModContainer(bmClazz, canonicalPath); return new ModLoaderModContainer(bmClazz, canonicalFile);
} }
/** /**

8
fml/bukkit/cpw/mods/fml/server/ModLoaderModContainer.java
View file

@ -43,11 +43,11 @@ public class ModLoaderModContainer implements ModContainer
private Class <? extends BaseMod > modClazz; private Class <? extends BaseMod > modClazz;
private BaseMod mod; private BaseMod mod;
private boolean isTicking; private boolean isTicking;
private String modSource ; private File modSource ;
private ArrayList<String> dependencies; private ArrayList<String> dependencies;
private ArrayList<String> preDependencies; private ArrayList<String> preDependencies;
private ArrayList<String> postDependencies; private ArrayList<String> postDependencies;
public ModLoaderModContainer(Class <? extends BaseMod > modClazz, String modSource) public ModLoaderModContainer(Class <? extends BaseMod > modClazz, File modSource)
{ {
this.modClazz = modClazz; this.modClazz = modClazz;
this.modSource = modSource; this.modSource = modSource;
@ -334,7 +334,7 @@ public class ModLoaderModContainer implements ModContainer
} }
@Override @Override
public String getSource() public File getSource()
{ {
return modSource; return modSource;
} }
@ -475,7 +475,7 @@ public class ModLoaderModContainer implements ModContainer
public String toString() public String toString()
{ {
return modSource; return modSource.getName();
} }
@Override @Override