diff --git a/patches/minecraft/net/minecraft/util/Vec3.java.patch b/patches/minecraft/net/minecraft/util/Vec3.java.patch new file mode 100644 index 0000000000..970d399e63 --- /dev/null +++ b/patches/minecraft/net/minecraft/util/Vec3.java.patch @@ -0,0 +1,35 @@ +--- ../src-base/minecraft/net/minecraft/util/Vec3.java ++++ ../src-work/minecraft/net/minecraft/util/Vec3.java +@@ -1,8 +1,5 @@ + package net.minecraft.util; + +-import cpw.mods.fml.relauncher.Side; +-import cpw.mods.fml.relauncher.SideOnly; +- + public class Vec3 + { + public static final Vec3Pool field_82592_a = new Vec3Pool(-1, -1); +@@ -48,7 +45,6 @@ + return this; + } + +- @SideOnly(Side.CLIENT) + public Vec3 func_72444_a(Vec3 p_72444_1_) + { + return this.field_72447_d.func_72345_a(p_72444_1_.field_72450_a - this.field_72450_a, p_72444_1_.field_72448_b - this.field_72448_b, p_72444_1_.field_72449_c - this.field_72449_c); +@@ -65,7 +61,6 @@ + return this.field_72450_a * p_72430_1_.field_72450_a + this.field_72448_b * p_72430_1_.field_72448_b + this.field_72449_c * p_72430_1_.field_72449_c; + } + +- @SideOnly(Side.CLIENT) + public Vec3 func_72431_c(Vec3 p_72431_1_) + { + return this.field_72447_d.func_72345_a(this.field_72448_b * p_72431_1_.field_72449_c - this.field_72449_c * p_72431_1_.field_72448_b, this.field_72449_c * p_72431_1_.field_72450_a - this.field_72450_a * p_72431_1_.field_72449_c, this.field_72450_a * p_72431_1_.field_72448_b - this.field_72448_b * p_72431_1_.field_72450_a); +@@ -185,7 +180,6 @@ + this.field_72449_c = d2; + } + +- @SideOnly(Side.CLIENT) + public void func_72446_c(float p_72446_1_) + { + float f1 = MathHelper.func_76134_b(p_72446_1_); diff --git a/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java b/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java index 5eaf3c50f8..ff05d595da 100644 --- a/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java @@ -1,4 +1,5 @@ package net.minecraftforge.client.model; +// TODO: Move this package to net.minecraftforge.model in 1.8 import java.util.Collection; import java.util.Map; diff --git a/src/main/java/net/minecraftforge/client/model/IModelCustom.java b/src/main/java/net/minecraftforge/client/model/IModelCustom.java index dce97e39e1..26463172f3 100644 --- a/src/main/java/net/minecraftforge/client/model/IModelCustom.java +++ b/src/main/java/net/minecraftforge/client/model/IModelCustom.java @@ -1,11 +1,17 @@ package net.minecraftforge.client.model; +import static cpw.mods.fml.relauncher.Side.CLIENT; +import cpw.mods.fml.relauncher.SideOnly; - -public interface IModelCustom { +public interface IModelCustom +{ String getType(); + @SideOnly(CLIENT) void renderAll(); + @SideOnly(CLIENT) void renderOnly(String... groupNames); + @SideOnly(CLIENT) void renderPart(String partName); + @SideOnly(CLIENT) void renderAllExcept(String... excludedGroupNames); } diff --git a/src/main/java/net/minecraftforge/client/model/obj/Face.java b/src/main/java/net/minecraftforge/client/model/obj/Face.java index aeda2a3e43..8033deee05 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/Face.java +++ b/src/main/java/net/minecraftforge/client/model/obj/Face.java @@ -5,20 +5,20 @@ import net.minecraft.util.Vec3; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@SideOnly(Side.CLIENT) public class Face { - public Vertex[] vertices; public Vertex[] vertexNormals; public Vertex faceNormal; public TextureCoordinate[] textureCoordinates; + @SideOnly(Side.CLIENT) public void addFaceForRender(Tessellator tessellator) { addFaceForRender(tessellator, 0.0005F); } + @SideOnly(Side.CLIENT) public void addFaceForRender(Tessellator tessellator, float textureOffset) { if (faceNormal == null) diff --git a/src/main/java/net/minecraftforge/client/model/obj/GroupObject.java b/src/main/java/net/minecraftforge/client/model/obj/GroupObject.java index 0bf36af46a..60a7fe494a 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/GroupObject.java +++ b/src/main/java/net/minecraftforge/client/model/obj/GroupObject.java @@ -6,10 +6,8 @@ import net.minecraft.client.renderer.Tessellator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@SideOnly(Side.CLIENT) public class GroupObject { - public String name; public ArrayList faces = new ArrayList(); public int glDrawingMode; @@ -30,6 +28,7 @@ public class GroupObject this.glDrawingMode = glDrawingMode; } + @SideOnly(Side.CLIENT) public void render() { if (faces.size() > 0) @@ -41,6 +40,7 @@ public class GroupObject } } + @SideOnly(Side.CLIENT) public void render(Tessellator tessellator) { if (faces.size() > 0) diff --git a/src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java b/src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java index 85839055eb..64d78d68cc 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java +++ b/src/main/java/net/minecraftforge/client/model/obj/TextureCoordinate.java @@ -3,10 +3,8 @@ package net.minecraftforge.client.model.obj; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@SideOnly(Side.CLIENT) public class TextureCoordinate { - public float u, v, w; public TextureCoordinate(float u, float v) diff --git a/src/main/java/net/minecraftforge/client/model/obj/Vertex.java b/src/main/java/net/minecraftforge/client/model/obj/Vertex.java index c4ecf35e94..d3fcb2bcff 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/Vertex.java +++ b/src/main/java/net/minecraftforge/client/model/obj/Vertex.java @@ -3,10 +3,8 @@ package net.minecraftforge.client.model.obj; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@SideOnly(Side.CLIENT) public class Vertex { - public float x, y, z; public Vertex(float x, float y) diff --git a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java index f6f13818c1..6c31381bf2 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java +++ b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java @@ -24,10 +24,8 @@ import cpw.mods.fml.relauncher.SideOnly; * Wavefront Object importer * Based heavily off of the specifications found at http://en.wikipedia.org/wiki/Wavefront_.obj_file */ -@SideOnly(Side.CLIENT) public class WavefrontObject implements IModelCustom { - private static Pattern vertexPattern = Pattern.compile("(v( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(v( (\\-){0,1}\\d+\\.\\d+){3,4} *$)"); private static Pattern vertexNormalPattern = Pattern.compile("(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *\\n)|(vn( (\\-){0,1}\\d+\\.\\d+){3,4} *$)"); private static Pattern textureCoordinatePattern = Pattern.compile("(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *\\n)|(vt( (\\-){0,1}\\d+\\.\\d+){2,3} *$)"); @@ -173,6 +171,7 @@ public class WavefrontObject implements IModelCustom } @Override + @SideOnly(Side.CLIENT) public void renderAll() { Tessellator tessellator = Tessellator.instance; @@ -190,6 +189,7 @@ public class WavefrontObject implements IModelCustom tessellator.draw(); } + @SideOnly(Side.CLIENT) public void tessellateAll(Tessellator tessellator) { for (GroupObject groupObject : groupObjects) @@ -199,6 +199,7 @@ public class WavefrontObject implements IModelCustom } @Override + @SideOnly(Side.CLIENT) public void renderOnly(String... groupNames) { for (GroupObject groupObject : groupObjects) @@ -213,6 +214,7 @@ public class WavefrontObject implements IModelCustom } } + @SideOnly(Side.CLIENT) public void tessellateOnly(Tessellator tessellator, String... groupNames) { for (GroupObject groupObject : groupObjects) { @@ -227,6 +229,7 @@ public class WavefrontObject implements IModelCustom } @Override + @SideOnly(Side.CLIENT) public void renderPart(String partName) { for (GroupObject groupObject : groupObjects) @@ -238,6 +241,7 @@ public class WavefrontObject implements IModelCustom } } + @SideOnly(Side.CLIENT) public void tessellatePart(Tessellator tessellator, String partName) { for (GroupObject groupObject : groupObjects) { @@ -249,6 +253,7 @@ public class WavefrontObject implements IModelCustom } @Override + @SideOnly(Side.CLIENT) public void renderAllExcept(String... excludedGroupNames) { for (GroupObject groupObject : groupObjects) @@ -268,6 +273,7 @@ public class WavefrontObject implements IModelCustom } } + @SideOnly(Side.CLIENT) public void tessellateAllExcept(Tessellator tessellator, String... excludedGroupNames) { boolean exclude;