From 8f563faec30c8cf0c9e9b612df867b4863365669 Mon Sep 17 00:00:00 2001 From: gamerforEA Date: Tue, 14 Apr 2015 13:49:32 +0300 Subject: [PATCH] Update to Forge 10.13.3.1370. --- build.gradle | 6 ++--- .../fml/common/registry/GameData.java.patch | 2 +- .../common/registry/GameRegistry.java.patch | 23 ++++++++++--------- .../fml/relauncher/CoreModManager.java.patch | 7 +++--- .../common/ForgeVersion.java.patch | 4 ++-- src/main/resources/fmlversion.properties | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index fece83f..8655b0d 100644 --- a/build.gradle +++ b/build.gradle @@ -44,8 +44,8 @@ minecraft { group = 'net.minecraftforge' ext.mcVersion = "1.7.10" ext.cauldronVersion = "1" -ext.forgeVersion = "1343" -ext.bukkitVersion = "01" +ext.forgeVersion = "1370" +ext.bukkitVersion = "1" version = "${mcVersion}-${cauldronVersion}.${forgeVersion}.${bukkitVersion}.0" jenkins { @@ -65,7 +65,7 @@ tasks.packageUniversal.manifest { 'Implementation-Vendor': 'Cauldron', 'Implementation-Title': 'Cauldron', 'Implementation-Version': 'git-Cauldron-Reloaded-'+project.version, - 'Forge-Version': '10.13.2.1343', + 'Forge-Version': '10.13.3.1370', 'Specification-Vendor': 'Bukkit Team', 'Specification-Title': 'Bukkit', 'Specification-Version': '1.7.10-R0.1-SNAPSHOT' diff --git a/patches/cpw/mods/fml/common/registry/GameData.java.patch b/patches/cpw/mods/fml/common/registry/GameData.java.patch index 275154d..df9307c 100644 --- a/patches/cpw/mods/fml/common/registry/GameData.java.patch +++ b/patches/cpw/mods/fml/common/registry/GameData.java.patch @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -@@ -1025,4 +1027,56 @@ +@@ -1031,4 +1033,56 @@ throw new RuntimeException("WHAT?"); } } diff --git a/patches/cpw/mods/fml/common/registry/GameRegistry.java.patch b/patches/cpw/mods/fml/common/registry/GameRegistry.java.patch index 86c77cd..541f43a 100644 --- a/patches/cpw/mods/fml/common/registry/GameRegistry.java.patch +++ b/patches/cpw/mods/fml/common/registry/GameRegistry.java.patch @@ -1,25 +1,26 @@ --- ../src-base/minecraft/cpw/mods/fml/common/registry/GameRegistry.java +++ ../src-work/minecraft/cpw/mods/fml/common/registry/GameRegistry.java -@@ -53,6 +53,7 @@ - import cpw.mods.fml.common.LoaderException; - import cpw.mods.fml.common.LoaderState; - import cpw.mods.fml.common.ObfuscationReflectionHelper; +@@ -24,6 +24,7 @@ + import java.util.Map; + import java.util.Random; + import java.util.Set; +import java.util.HashMap; // Cauldron - public class GameRegistry - { -@@ -60,6 +61,10 @@ - private static Map worldGeneratorIndex = Maps.newHashMap(); + import net.minecraft.block.Block; + import net.minecraft.item.Item; +@@ -61,6 +62,11 @@ private static List fuelHandlers = Lists.newArrayList(); private static List sortedGeneratorList; + + // Cauldron start + private static Map configWorldGenCache = new HashMap(); + private static Map worldGenMap = new HashMap(); + // Cauldron end - ++ /** * 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) { @@ -38,7 +39,7 @@ } /** -@@ -100,11 +111,27 @@ +@@ -100,11 +112,27 @@ long zSeed = fmlRandom.nextLong() >> 2 + 1L; long chunkSeed = (xSeed * chunkX + zSeed * chunkZ) ^ worldSeed; diff --git a/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch b/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch index 4111d3a..75603cd 100644 --- a/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch +++ b/patches/cpw/mods/fml/relauncher/CoreModManager.java.patch @@ -10,11 +10,10 @@ public static void handleLaunch(File mcDir, LaunchClassLoader classLoader, FMLTweaker tweaker) { CoreModManager.mcDir = mcDir; -@@ -212,7 +215,19 @@ +@@ -212,6 +215,19 @@ loadCoreMod(classLoader, coreModClassName, null); } discoverCoreMods(mcDir, classLoader); -- + // Cauldron start - group output of @MCVersion warnings + if (!noVersionAnnotationCoreMods.isEmpty()) + { @@ -28,10 +27,10 @@ + FMLRelaunchLog.warning(sb.toString()); + } + // Cauldron end + } - private static void discoverCoreMods(File mcDir, LaunchClassLoader classLoader) -@@ -424,8 +439,11 @@ +@@ -424,8 +440,11 @@ MCVersion requiredMCVersion = coreModClazz.getAnnotation(IFMLLoadingPlugin.MCVersion.class); if (!Arrays.asList(rootPlugins).contains(coreModClass) && (requiredMCVersion == null || Strings.isNullOrEmpty(requiredMCVersion.value()))) { diff --git a/patches/net/minecraftforge/common/ForgeVersion.java.patch b/patches/net/minecraftforge/common/ForgeVersion.java.patch index 7caefc7..82458ea 100644 --- a/patches/net/minecraftforge/common/ForgeVersion.java.patch +++ b/patches/net/minecraftforge/common/ForgeVersion.java.patch @@ -2,10 +2,10 @@ +++ ../src-work/minecraft/net/minecraftforge/common/ForgeVersion.java @@ -25,7 +25,7 @@ //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. - 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 String target = null; diff --git a/src/main/resources/fmlversion.properties b/src/main/resources/fmlversion.properties index 273de10..98551cb 100644 --- a/src/main/resources/fmlversion.properties +++ b/src/main/resources/fmlversion.properties @@ -1,6 +1,6 @@ fmlbuild.major.number=7 fmlbuild.minor.number=10 -fmlbuild.revision.number=97 -fmlbuild.build.number=1343 +fmlbuild.revision.number=112 +fmlbuild.build.number=1370 fmlbuild.mcversion=1.7.10 fmlbuild.mcpversion=9.05