xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Update to Forge 1420

Browse Source
This commit is contained in:
Prototik 2015-06-01 16:13:46 +07:00
parent 0edf4ecfae
commit 9973a9f8e8
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -65,10 +65,10 @@ def retrieveGitBranch() {
} }
ext.mcVersion = "1.7.10" ext.mcVersion = "1.7.10"
ext.forgeVersion = "1408" ext.forgeVersion = "1420"
ext.revision = retrieveBuildNumber() ext.revision = retrieveBuildNumber()
version = "${mcVersion}-${forgeVersion}.${revision}" version = "${mcVersion}-${forgeVersion}.${revision}"
println " # Updated KCauldron version: ${version}" println "Updated KCauldron version: ${version}"
launch4j { launch4j {
jreMinVersion = '1.6.0' jreMinVersion = '1.6.0'
@ -83,7 +83,7 @@ tasks.packageUniversal {
'Implementation-Vendor': 'Prototik', 'Implementation-Vendor': 'Prototik',
'Implementationk-Title': 'KCauldron', 'Implementationk-Title': 'KCauldron',
'Implementation-Version': 'KCauldron-'+project.version, 'Implementation-Version': 'KCauldron-'+project.version,
'Forge-Version': '10.13.3.1408', 'Forge-Version': '10.13.3.1420',
'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'

2
forge

@ -1 +1 @@
Subproject commit 06398fa25990b458ee3183e0cf9066a3a75f221e Subproject commit bd6630810f3d4e04438ca77099b5fc19cf474b9c

6
patches/cpw/mods/fml/common/registry/GameRegistry.java.patch
View File

@ -8,7 +8,7 @@
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@@ -61,6 +62,11 @@ @@ -67,6 +68,11 @@
private static List<IFuelHandler> fuelHandlers = Lists.newArrayList(); private static List<IFuelHandler> fuelHandlers = Lists.newArrayList();
private static List<IWorldGenerator> sortedGeneratorList; private static List<IWorldGenerator> sortedGeneratorList;
@ -20,7 +20,7 @@
/** /**
* 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 +76,18 @@ @@ -76,12 +82,18 @@
*/ */
public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight) public static void registerWorldGenerator(IWorldGenerator generator, int modGenerationWeight)
{ {
@ -39,7 +39,7 @@
} }
/** /**
@@ -100,11 +112,27 @@ @@ -106,11 +118,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;

2
patches/net/minecraftforge/common/ForgeVersion.java.patch
View File

@ -5,7 +5,7 @@
public static final int revisionVersion = 3; 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 = 1408; // Cauldron + public static final int buildVersion = 1420; // Cauldron
private static Status status = PENDING; private static Status status = PENDING;
private static String target = null; private static String target = null;

2
src/main/resources/fmlversion.properties
View File

@ -1,6 +1,6 @@
fmlbuild.major.number=7 fmlbuild.major.number=7
fmlbuild.minor.number=99 fmlbuild.minor.number=99
fmlbuild.revision.number=4 fmlbuild.revision.number=4
fmlbuild.build.number=1408 fmlbuild.build.number=1420
fmlbuild.mcversion=1.7.10 fmlbuild.mcversion=1.7.10
fmlbuild.mcpversion=9.05 fmlbuild.mcpversion=9.05