3
0
Fork 1

Update to Forge 10.13.3.1370.

kcx-1614
gamerforEA 2015-04-14 13:49:32 +03:00
parent 333fb85303
commit 8f563faec3
6 changed files with 23 additions and 23 deletions

View File

@ -44,8 +44,8 @@ minecraft {
group = 'net.minecraftforge' group = 'net.minecraftforge'
ext.mcVersion = "1.7.10" ext.mcVersion = "1.7.10"
ext.cauldronVersion = "1" ext.cauldronVersion = "1"
ext.forgeVersion = "1343" ext.forgeVersion = "1370"
ext.bukkitVersion = "01" ext.bukkitVersion = "1"
version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${bukkitVersion}.0" version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${bukkitVersion}.0"
jenkins { jenkins {
@ -65,7 +65,7 @@ tasks.packageUniversal.manifest {
'Implementation-Vendor': 'Cauldron', 'Implementation-Vendor': 'Cauldron',
'Implementation-Title': 'Cauldron', 'Implementation-Title': 'Cauldron',
'Implementation-Version': 'git-Cauldron-Reloaded-'+project.version, 'Implementation-Version': 'git-Cauldron-Reloaded-'+project.version,
'Forge-Version': '10.13.2.1343', 'Forge-Version': '10.13.3.1370',
'Specification-Vendor': 'Bukkit Team', 'Specification-Vendor': 'Bukkit Team',
'Specification-Title': 'Bukkit', 'Specification-Title': 'Bukkit',
'Specification-Version': '1.7.10-R0.1-SNAPSHOT' 'Specification-Version': '1.7.10-R0.1-SNAPSHOT'

View File

@ -10,7 +10,7 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
@@ -1025,4 +1027,56 @@ @@ -1031,4 +1033,56 @@
throw new RuntimeException("WHAT?"); throw new RuntimeException("WHAT?");
} }
} }

View File

@ -1,25 +1,26 @@
--- ../src-base/minecraft/cpw/mods/fml/common/registry/GameRegistry.java --- ../src-base/minecraft/cpw/mods/fml/common/registry/GameRegistry.java
+++ ../src-work/minecraft/cpw/mods/fml/common/registry/GameRegistry.java +++ ../src-work/minecraft/cpw/mods/fml/common/registry/GameRegistry.java
@@ -53,6 +53,7 @@ @@ -24,6 +24,7 @@
import cpw.mods.fml.common.LoaderException; import java.util.Map;
import cpw.mods.fml.common.LoaderState; import java.util.Random;
import cpw.mods.fml.common.ObfuscationReflectionHelper; import java.util.Set;
+import java.util.HashMap; // Cauldron +import java.util.HashMap; // Cauldron
public class GameRegistry import net.minecraft.block.Block;
{ import net.minecraft.item.Item;
@@ -60,6 +61,10 @@ @@ -61,6 +62,11 @@
private static Map<IWorldGenerator, Integer> worldGeneratorIndex = Maps.newHashMap();
private static List<IFuelHandler> fuelHandlers = Lists.newArrayList(); private static List<IFuelHandler> fuelHandlers = Lists.newArrayList();
private static List<IWorldGenerator> sortedGeneratorList; private static List<IWorldGenerator> sortedGeneratorList;
+ // Cauldron start + // Cauldron start
+ private static Map<String, Boolean> configWorldGenCache = new HashMap<String, Boolean>(); + private static Map<String, Boolean> configWorldGenCache = new HashMap<String, Boolean>();
+ private static Map<String, String> worldGenMap = new HashMap<String, String>(); + private static Map<String, String> worldGenMap = new HashMap<String, String>();
+ // Cauldron end + // Cauldron end
+
/** /**
* Register a world generator - something that inserts new block types into the world * Register a world generator - something that inserts new block types into the world
@@ -70,12 +75,18 @@ *
@@ -70,12 +76,18 @@
*/ */
public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight) public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight)
{ {
@ -38,7 +39,7 @@
} }
/** /**
@@ -100,11 +111,27 @@ @@ -100,11 +112,27 @@
long zSeed = fmlRandom.nextLong() >> 2 + 1L; long zSeed = fmlRandom.nextLong() >> 2 + 1L;
long chunkSeed = (xSeed * chunkX + zSeed * chunkZ) ^ worldSeed; long chunkSeed = (xSeed * chunkX + zSeed * chunkZ) ^ worldSeed;

View File

@ -10,11 +10,10 @@
public static void handleLaunch(File mcDir, LaunchClassLoader classLoader, FMLTweaker tweaker) public static void handleLaunch(File mcDir, LaunchClassLoader classLoader, FMLTweaker tweaker)
{ {
CoreModManager.mcDir = mcDir; CoreModManager.mcDir = mcDir;
@@ -212,7 +215,19 @@ @@ -212,6 +215,19 @@
loadCoreMod(classLoader, coreModClassName, null); loadCoreMod(classLoader, coreModClassName, null);
} }
discoverCoreMods(mcDir, classLoader); discoverCoreMods(mcDir, classLoader);
-
+ // Cauldron start - group output of @MCVersion warnings + // Cauldron start - group output of @MCVersion warnings
+ if (!noVersionAnnotationCoreMods.isEmpty()) + if (!noVersionAnnotationCoreMods.isEmpty())
+ { + {
@ -28,10 +27,10 @@
+ FMLRelaunchLog.warning(sb.toString()); + FMLRelaunchLog.warning(sb.toString());
+ } + }
+ // Cauldron end + // Cauldron end
} }
private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader) @@ -424,8 +440,11 @@
@@ -424,8 +439,11 @@
MCVersion requiredMCVersion = coreModClazz.getAnnotation(IFMLLoadingPlugin.MCVersion.class); MCVersion requiredMCVersion = coreModClazz.getAnnotation(IFMLLoadingPlugin.MCVersion.class);
if (!Arrays.asList(rootPlugins).contains(coreModClass) && (requiredMCVersion == null || Strings.isNullOrEmpty(requiredMCVersion.value()))) if (!Arrays.asList(rootPlugins).contains(coreModClass) && (requiredMCVersion == null || Strings.isNullOrEmpty(requiredMCVersion.value())))
{ {

View File

@ -2,10 +2,10 @@
+++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java +++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
//This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version //This number is incremented every time a interface changes or new major feature is added, and reset every Minecraft version
public static final int revisionVersion = 2; public static final int revisionVersion = 3;
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code. //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; - public static final int buildVersion = 0;
+ public static final int buildVersion = 1343; // Cauldron + public static final int buildVersion = 1370; // Cauldron
private static Status status = PENDING; private static Status status = PENDING;
private static String target = null; private static String target = null;

View File

@ -1,6 +1,6 @@
fmlbuild.major.number=7 fmlbuild.major.number=7
fmlbuild.minor.number=10 fmlbuild.minor.number=10
fmlbuild.revision.number=97 fmlbuild.revision.number=112
fmlbuild.build.number=1343 fmlbuild.build.number=1370
fmlbuild.mcversion=1.7.10 fmlbuild.mcversion=1.7.10
fmlbuild.mcpversion=9.05 fmlbuild.mcpversion=9.05