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

Remove some side onlys on BiomeEvents that don't need them.

Browse source
This commit is contained in:
Lex Manos 2013-09-24 21:43:56 -07:00
parent 0c064485b1
commit 70671858c2
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/net/minecraftforge/event/terraingen/BiomeEvent.java
View file

@ -41,9 +41,7 @@ public class BiomeEvent extends Event
this.replacement = replacement;
}
}
@SideOnly(Side.CLIENT)
public static class BiomeColor extends BiomeEvent
{
public final int originalColor;
@ -90,8 +88,6 @@ public class BiomeEvent extends Event
/**
* This event is fired when a biome is queried for its grass color.
*/
@SideOnly(Side.CLIENT)
public static class GetGrassColor extends BiomeColor
{
public GetGrassColor(BiomeGenBase biome, int original)
@ -103,7 +99,6 @@ public class BiomeEvent extends Event
/**
* This event is fired when a biome is queried for its grass color.
*/
@SideOnly(Side.CLIENT)
public static class GetFoliageColor extends BiomeColor
{
public GetFoliageColor(BiomeGenBase biome, int original)
@ -115,7 +110,6 @@ public class BiomeEvent extends Event
/**
* This event is fired when a biome is queried for its water color.
*/
@SideOnly(Side.CLIENT)
public static class GetWaterColor extends BiomeColor
{
public GetWaterColor(BiomeGenBase biome, int original)

6
patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch
View file

@ -30,7 +30,7 @@
}
@SideOnly(Side.CLIENT)
@@ -384,6 +387,36 @@
@@ -384,6 +387,32 @@
{
double d0 = (double)MathHelper.clamp_float(this.getFloatTemperature(), 0.0F, 1.0F);
double d1 = (double)MathHelper.clamp_float(this.getFloatRainfall(), 0.0F, 1.0F);
@ -43,7 +43,6 @@
+ return new DeferredBiomeDecorator(this, original);
+ }
+
+ @SideOnly(Side.CLIENT)
+ public int getWaterColorMultiplier()
+ {
+ BiomeEvent.GetWaterColor event = new BiomeEvent.GetWaterColor(this, waterColorMultiplier);
@ -51,16 +50,13 @@
+ return event.newColor;
+ }
+
+ @SideOnly(Side.CLIENT)
+ public int getModdedBiomeGrassColor(int original)
+ {
+ BiomeEvent.GetGrassColor event = new BiomeEvent.GetGrassColor(this, original);
+ MinecraftForge.EVENT_BUS.post(event);
+ return event.newColor;
+ }
+
+
+ @SideOnly(Side.CLIENT)
+ public int getModdedBiomeFoliageColor(int original)
+ {
+ BiomeEvent.GetFoliageColor event = new BiomeEvent.GetFoliageColor(this, original);