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

Fix patch errors in merge of last PR -.-

Browse source
This commit is contained in:
LexManos 2012-09-23 16:53:20 -07:00
parent 0d0ba4b2d5
commit a9e3a4dbb9
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
patches/common/net/minecraft/src/WorldProvider.java.patch
View file

@ -8,16 +8,7 @@
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;
@@ -30,6 +32,8 @@ @@ -185,7 +187,7 @@
/** Array for sunrise/sunset colors (RGBA) */
private float[] colorsSunriseSunset = new float[4];
+
+ private SkyProvider skyProvider = null;
/**
* associate an existing world with a World provider, and setup its lightbrightness table
@@ -185,7 +189,7 @@
public static WorldProvider getProviderForDimension(int par0) public static WorldProvider getProviderForDimension(int par0)
{ {
@ -26,14 +17,13 @@
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@@ -254,4 +258,241 @@ @@ -254,4 +256,238 @@
* Returns the dimension's name, e.g. "The End", "Nether", or "Overworld". * Returns the dimension's name, e.g. "The End", "Nether", or "Overworld".
*/ */
public abstract String getDimensionName(); public abstract String getDimensionName();
+
+ +
+ /*======================================= Forge Start =========================================*/ + /*======================================= Forge Start =========================================*/
+ + private SkyProvider skyProvider = null;
+ /** + /**
+ * Sets the providers current dimension ID, used in default getSaveFolder() + * Sets the providers current dimension ID, used in default getSaveFolder()
+ * Added to allow default providers to be registered for multiple dimensions. + * Added to allow default providers to be registered for multiple dimensions.
@ -135,7 +125,6 @@
+ +
+ return var5; + return var5;
+ } + }
+
+ +
+ /*======================================= Start Moved From World =========================================*/ + /*======================================= Start Moved From World =========================================*/
+ +