From d5b387ef4d789cb89b6152211559acfdb7174c13 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 31 Jan 2019 23:07:47 +0200 Subject: [PATCH] Fix gradle --- build.gradle | 2 ++ .../java/com/minelittlepony/util/render/Box.java | 1 + .../java/com/minelittlepony/util/render/Color.java | 1 + .../java/com/minelittlepony/util/render/Quad.java | 1 + .../java/com/minelittlepony/util/render/Vertex.java | 1 + 5 files changed, 6 insertions(+) rename src/{main => external}/java/com/minelittlepony/util/render/Box.java (98%) rename src/{main => external}/java/com/minelittlepony/util/render/Color.java (96%) rename src/{main => external}/java/com/minelittlepony/util/render/Quad.java (94%) rename src/{main => external}/java/com/minelittlepony/util/render/Vertex.java (96%) diff --git a/build.gradle b/build.gradle index 48dd44fd..fa78300f 100644 --- a/build.gradle +++ b/build.gradle @@ -87,5 +87,7 @@ processResources { } jar { + from sourceSets.main.output + from sourceSets.external.output baseName = "Unicopia-mc${project.mcVersion}" } diff --git a/src/main/java/com/minelittlepony/util/render/Box.java b/src/external/java/com/minelittlepony/util/render/Box.java similarity index 98% rename from src/main/java/com/minelittlepony/util/render/Box.java rename to src/external/java/com/minelittlepony/util/render/Box.java index 0c4ad8f6..0c9a1c69 100644 --- a/src/main/java/com/minelittlepony/util/render/Box.java +++ b/src/external/java/com/minelittlepony/util/render/Box.java @@ -3,6 +3,7 @@ package com.minelittlepony.util.render; import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; +//#MineLittlePony# public abstract class Box extends ModelBox { protected final T parent; diff --git a/src/main/java/com/minelittlepony/util/render/Color.java b/src/external/java/com/minelittlepony/util/render/Color.java similarity index 96% rename from src/main/java/com/minelittlepony/util/render/Color.java rename to src/external/java/com/minelittlepony/util/render/Color.java index 967e061b..dc04a79e 100644 --- a/src/main/java/com/minelittlepony/util/render/Color.java +++ b/src/external/java/com/minelittlepony/util/render/Color.java @@ -2,6 +2,7 @@ package com.minelittlepony.util.render; import net.minecraft.client.renderer.GlStateManager; +//#MineLittlePony# public interface Color { static float r(int color) { return (color >> 16 & 255) / 255F; diff --git a/src/main/java/com/minelittlepony/util/render/Quad.java b/src/external/java/com/minelittlepony/util/render/Quad.java similarity index 94% rename from src/main/java/com/minelittlepony/util/render/Quad.java rename to src/external/java/com/minelittlepony/util/render/Quad.java index d508dc37..c6020942 100644 --- a/src/main/java/com/minelittlepony/util/render/Quad.java +++ b/src/external/java/com/minelittlepony/util/render/Quad.java @@ -2,6 +2,7 @@ package com.minelittlepony.util.render; import net.minecraft.client.model.TexturedQuad; +//#MineLittlePony# public class Quad extends TexturedQuad { Quad(Vertex[] vertices, int texcoordU1, int texcoordV1, int texcoordU2, int texcoordV2, float textureWidth, float textureHeight) { super(vertices, texcoordU1, texcoordV1, texcoordU2, texcoordV2, textureWidth, textureHeight); diff --git a/src/main/java/com/minelittlepony/util/render/Vertex.java b/src/external/java/com/minelittlepony/util/render/Vertex.java similarity index 96% rename from src/main/java/com/minelittlepony/util/render/Vertex.java rename to src/external/java/com/minelittlepony/util/render/Vertex.java index e7704ad9..08052332 100644 --- a/src/main/java/com/minelittlepony/util/render/Vertex.java +++ b/src/external/java/com/minelittlepony/util/render/Vertex.java @@ -2,6 +2,7 @@ package com.minelittlepony.util.render; import net.minecraft.client.model.PositionTextureVertex; +//#MineLittlePony# public class Vertex extends PositionTextureVertex { public Vertex(float x, float y, float z, float texX, float texY) {