mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 20:22:28 +00:00
Forgot to regen patches...
This commit is contained in:
1 parent
08a875c39a
commit
1959e414e2
3 files changed
+5
-5
No files matched your search
@@ -146,7 +146,7 @@
|
||||
}
|
||||
|
||||
this.theIntegratedServer = null;
|
||||
@@ -2287,113 +2322,10 @@
|
||||
@@ -2288,113 +2323,10 @@
|
||||
if (this.objectMouseOver != null)
|
||||
{
|
||||
boolean flag = this.thePlayer.capabilities.isCreativeMode;
|
||||
@@ -262,7 +262,7 @@
|
||||
if (flag)
|
||||
{
|
||||
j = this.thePlayer.inventoryContainer.inventorySlots.size() - 9 + this.thePlayer.inventory.currentItem;
|
||||
@@ -2563,9 +2495,16 @@
|
||||
@@ -2564,9 +2496,16 @@
|
||||
par1PlayerUsageSnooper.addData("gl_max_texture_size", Integer.valueOf(getGLMaximumTextureSize()));
|
||||
}
|
||||
|
||||
@@ -279,7 +279,7 @@
|
||||
for (int i = 16384; i > 0; i >>= 1)
|
||||
{
|
||||
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null);
|
||||
@@ -2573,6 +2512,7 @@
|
||||
@@ -2574,6 +2513,7 @@
|
||||
|
||||
if (j != 0)
|
||||
{
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
+ * @param parentLayer The parent layer to feed into any layer you return
|
||||
+ * @return A GenLayer that will return ints representing the Biomes to be generated, see GenLayerBiome
|
||||
+ */
|
||||
+ public GenLayer getBiomeLayer(int worldSeed, GenLayer parentLayer)
|
||||
+ public GenLayer getBiomeLayer(long worldSeed, GenLayer parentLayer)
|
||||
+ {
|
||||
+ GenLayer ret = new GenLayerBiome(200L, parentLayer, this);
|
||||
+ ret = GenLayerZoom.magnify(1000L, ret, 2);
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
GenLayer genlayer = GenLayerZoom.magnify(1000L, genlayer3, 0);
|
||||
GenLayerRiverInit genlayerriverinit = new GenLayerRiverInit(100L, genlayer);
|
||||
- Object object = new GenLayerBiome(200L, genlayer3, par2WorldType);
|
||||
+ Object object = par2WorldType.getBiomeLayer(flag, genlayer3);
|
||||
+ Object object = par2WorldType.getBiomeLayer(par0, genlayer3);
|
||||
|
||||
- if (!flag)
|
||||
- {
|
||||
|
||||
Reference in new issue
Block a user