From 70671858c215d4ae7b8f81a779aa955a261c10a1 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Tue, 24 Sep 2013 21:43:56 -0700 Subject: [PATCH] Remove some side onlys on BiomeEvents that don't need them. --- common/net/minecraftforge/event/terraingen/BiomeEvent.java | 6 ------ .../net/minecraft/world/biome/BiomeGenBase.java.patch | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/common/net/minecraftforge/event/terraingen/BiomeEvent.java b/common/net/minecraftforge/event/terraingen/BiomeEvent.java index 8f4917b9e..d5eb6eea4 100644 --- a/common/net/minecraftforge/event/terraingen/BiomeEvent.java +++ b/common/net/minecraftforge/event/terraingen/BiomeEvent.java @@ -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) diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch index a94a31970..fc952c9db 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.java.patch @@ -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);