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

Merge pull request #2044 from rubensworks/enumfacing-server

Browse source 
Remove SideOnly's from EnumFacing allowing full class to be used on both sides.
This commit is contained in:
LexManos 2015-07-23 10:58:17 -07:00
commit b8fe3913e9
1 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
patches/minecraft/net/minecraft/util/EnumFacing.java.patch
View file

@ -1,6 +1,71 @@
--- ../src-base/minecraft/net/minecraft/util/EnumFacing.java
+++ ../src-work/minecraft/net/minecraft/util/EnumFacing.java
@@ -376,7 +376,7 @@
@@ -6,8 +6,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
public enum EnumFacing implements IStringSerializable
{
@@ -61,7 +59,6 @@
return func_82600_a(this.field_176759_h);
}
- @SideOnly(Side.CLIENT)
public EnumFacing func_176732_a(EnumFacing.Axis p_176732_1_)
{
switch (EnumFacing.SwitchPlane.field_179515_a[p_176732_1_.ordinal()])
@@ -109,7 +106,6 @@
}
}
- @SideOnly(Side.CLIENT)
private EnumFacing func_176744_n()
{
switch (EnumFacing.SwitchPlane.field_179513_b[this.ordinal()])
@@ -129,7 +125,6 @@
}
}
- @SideOnly(Side.CLIENT)
private EnumFacing func_176738_p()
{
switch (EnumFacing.SwitchPlane.field_179513_b[this.ordinal()])
@@ -190,7 +185,6 @@
return this.field_176758_k;
}
- @SideOnly(Side.CLIENT)
public static EnumFacing func_176739_a(String p_176739_0_)
{
return p_176739_0_ == null ? null : (EnumFacing)field_176761_p.get(p_176739_0_.toLowerCase());
@@ -216,7 +210,6 @@
return values()[p_176741_0_.nextInt(values().length)];
}
- @SideOnly(Side.CLIENT)
public static EnumFacing func_176737_a(float p_176737_0_, float p_176737_1_, float p_176737_2_)
{
EnumFacing enumfacing = NORTH;
@@ -249,7 +242,6 @@
return this.field_176757_j;
}
- @SideOnly(Side.CLIENT)
public Vec3i func_176730_m()
{
return this.field_176756_m;
@@ -291,7 +283,6 @@
this.field_176723_f = p_i46015_4_;
}
- @SideOnly(Side.CLIENT)
public static EnumFacing.Axis func_176717_a(String p_176717_0_)
{
return p_176717_0_ == null ? null : (EnumFacing.Axis)field_176725_d.get(p_176717_0_.toLowerCase());
@@ -376,7 +367,7 @@
}
}