Initial 1.11 release update.

This commit is contained in:
LexManos committed 2016-11-15 19:26:10 -08:00
1 parent 4e6a774075
commit c459b87ec9
34 files changed
+849 -69

No files matched your search

@@ -125,7 +125,7 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
{
super(new ModMetadata());
ModMetadata meta = getMetadata();
meta.modId = "Forge";
meta.modId = "forge";
meta.name = "Minecraft Forge";
meta.version = ForgeVersion.getVersion();
meta.credits = "Made possible with help from many people";
@@ -58,9 +58,9 @@ public class ForgeVersion
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
public static final int buildVersion = 0;
// This is the minecraft version we're building for - used in various places in Forge/FML code
public static final String mcVersion = "1.11_pre1";
public static final String mcVersion = "1.11";
// This is the MCP data version we're using
public static final String mcpVersion = "9.34";
public static final String mcpVersion = "9.35";
@SuppressWarnings("unused")
private static Status status = PENDING;
@SuppressWarnings("unused")
@@ -184,6 +184,13 @@ public class VillagerRegistry
(new VillagerCareer(prof, "butcher")).init(VanillaTrades.trades[4][0]);
(new VillagerCareer(prof, "leather")).init(VanillaTrades.trades[4][1]);
}
prof = new VillagerProfession("minecraft:nitwit",
"minecraft:textures/entity/villager/nitwit.png",
"minecraft:textures/entity/zombie_villager/zombie_nitwit.png");
{
register(prof, 5);
(new VillagerCareer(prof, "nitwit")).init(VanillaTrades.trades[5][0]);
}
}
public static class VillagerProfession extends IForgeRegistryEntry.Impl<VillagerProfession>
@@ -357,7 +364,7 @@ public class VillagerRegistry
public static void onSetProfession(EntityZombieVillager entity, int network)
{
int realID = network - 1;
int realID = network;
VillagerProfession prof = INSTANCE.professions.getObjectById(realID);
if (prof == null && network != 0 || INSTANCE.professions.getId(prof) != realID)
{