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

Merge branch '1.7.10'

Browse source
This commit is contained in:
cpw 2015-08-01 20:30:22 -04:00
commit 5045d8df68
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml/src/main/java/net/minecraftforge/fml/common/discovery/ModCandidate.java
View file

@ -80,7 +80,7 @@ public class ModCandidate
public void addClassEntry(String name)
{
String className = name.substring(0, name.lastIndexOf('.')); // strip the .class
foundClasses.add(className.replace('.', '/'));
foundClasses.add(className);
className = className.replace('/','.');
int pkgIdx = className.lastIndexOf('.');
if (pkgIdx > -1)

4
fml/src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRef.java
View file

@ -65,7 +65,7 @@ class ObjectHolderRef {
if (this.injectedObject == null || !isValid())
{
throw new IllegalStateException("The ObjectHolder annotation cannot apply to a field that is not an Item or Block");
throw new IllegalStateException(String.format("The ObjectHolder annotation cannot apply to a field that is not an Item or Block (found : %s at %s.%s)", field.getType().getName(), field.getClass().getName(), field.getName()));
}
makeWritable(field);
}
@ -120,7 +120,7 @@ class ObjectHolderRef {
if (thing == null)
{
FMLLog.warning("Unable to lookup %s for %s. Is there something wrong with the registry?", injectedObject, field);
FMLLog.getLogger().log(Level.DEBUG, "Unable to lookup {} for {}. This means the object wasn't registered. It's likely just mod options.", injectedObject, field);
return;
}
try

3
src/main/java/net/minecraftforge/common/MinecraftForge.java
View file

@ -12,6 +12,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraft.crash.CrashReport;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeHooks.SeedEntry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.oredict.OreDictionary;
public class MinecraftForge
@ -162,6 +163,8 @@ public class MinecraftForge
}
UsernameCache.load();
// Load before all the mods, so MC owns the MC fluids
FluidRegistry.validateFluidRegistry();
}
public static String getBrandingVersion()

2
src/main/java/net/minecraftforge/fluids/FluidRegistry.java
View file

@ -114,7 +114,7 @@ public abstract class FluidRegistry
Integer id = localFluidIDs.remove(oldFluid);
localFluidIDs.put(fluid, id);
}
BiMap<Integer, String> localFluidNames = fluidNames;
BiMap<Integer, String> localFluidNames = HashBiMap.create();
for (Entry<Fluid, Integer> e : localFluidIDs.entrySet()) {
localFluidNames.put(e.getValue(), e.getKey().getName());
}