Merge branch '1.10.2' into 1.11

Conflicts: BnnWidget build.gradle gradle.properties
Team-Fruit · Jan 8, 2017 · 3a85dc6 · 3a85dc6
2 parents 1b9fdad + c71a3e2
commit 3a85dc6
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@
 !/install.bat
 !/build.bat
 !/.gitignore
+!/.gitmodules
+!/.gitattributes
diff --git a/BnnWidget b/BnnWidget
diff --git a/build.gradle b/build.gradle
@@ -29,6 +29,8 @@ ext.modversion = "${project.version_major}.${project.version_minor}.${project.ve
 group = project.group
 version = "${project.version_minecraft}-${modversion}"
 compileJava.options.encoding = 'UTF-8'
+compileApiJava.options.encoding = 'UTF-8'
+
 sourceCompatibility = targetCompatibility = "1.6"
 compileJava {
     sourceCompatibility = targetCompatibility = "1.6"

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ extra_fmlcore=com.kamesuta.mc.signpic.asm.SignPictureCorePlugin
 extra_fmlmod=com.kamesuta.mc.signpic.SignPicture
 version_major=2
 version_minor=7
-version_micro=0
+version_micro=1
 version_minecraft=1.11
 version_forge=13.19.1.2189
 version_minforge=13.19.1.2189

diff --git a/src/main/java/com/kamesuta/mc/signpic/attr/prop/TextureData.java b/src/main/java/com/kamesuta/mc/signpic/attr/prop/TextureData.java
@@ -8,7 +8,7 @@
 import org.apache.commons.lang3.math.NumberUtils;
 
 import com.kamesuta.mc.bnnwidget.ShortestFloatFormatter;
-import com.kamesuta.mc.bnnwidget.WRenderer.BlendType;
+import com.kamesuta.mc.bnnwidget.render.WRenderer.BlendType;
 import com.kamesuta.mc.signpic.attr.IPropBuilder;
 import com.kamesuta.mc.signpic.attr.IPropInterpolatable;
 

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiImage.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiImage.java
@@ -9,7 +9,6 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WFrame;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MScaledLabel;
 import com.kamesuta.mc.bnnwidget.motion.Easings;
 import com.kamesuta.mc.bnnwidget.motion.Motion;
@@ -18,6 +17,7 @@
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VCommon;
 import com.kamesuta.mc.bnnwidget.var.VMotion;
@@ -82,7 +82,7 @@ public void draw(final @Nonnull WEvent ev, final @Nonnull Area pgp, final @Nonnu
 							WRenderer.startShape();
 							OpenGL.glLineWidth(1f);
 							OpenGL.glColor4f(1.0F, 0.0F, 0.0F, opacity*1.0F);
-							draw(0, 0, 1, 1, GL_LINE_LOOP);
+							drawAbs(0, 0, 1, 1, GL_LINE_LOOP);
 						}
 						OpenGL.glPopMatrix();
 

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiMain.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiMain.java
@@ -13,7 +13,6 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WFrame;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.FunnyButton;
 import com.kamesuta.mc.bnnwidget.component.MButton;
 import com.kamesuta.mc.bnnwidget.component.MChatTextField;
@@ -26,6 +25,7 @@
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VMotion;
 import com.kamesuta.mc.signpic.Apis;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiPAAS.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiPAAS.java
@@ -8,14 +8,14 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WFrame;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MLabel;
 import com.kamesuta.mc.bnnwidget.motion.Easings;
 import com.kamesuta.mc.bnnwidget.position.Area;
 import com.kamesuta.mc.bnnwidget.position.Coord;
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VMotion;
 import com.kamesuta.mc.signpic.Client;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiSettings.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiSettings.java
@@ -14,7 +14,6 @@
 import com.kamesuta.mc.bnnwidget.WBox;
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MButton;
 import com.kamesuta.mc.bnnwidget.component.MCheckBox;
 import com.kamesuta.mc.bnnwidget.component.MLabel;
@@ -29,6 +28,7 @@
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VCommon;
 import com.kamesuta.mc.bnnwidget.var.VMotion;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiSignOption.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiSignOption.java
@@ -8,7 +8,6 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WFrame;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MButton;
 import com.kamesuta.mc.bnnwidget.component.MLabel;
 import com.kamesuta.mc.bnnwidget.component.MSelectButton;
@@ -19,6 +18,7 @@
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VCommon;
 import com.kamesuta.mc.bnnwidget.var.VMotion;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/GuiTask.java b/src/main/java/com/kamesuta/mc/signpic/gui/GuiTask.java
@@ -9,14 +9,14 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WList;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.motion.Easings;
 import com.kamesuta.mc.bnnwidget.motion.Motion;
 import com.kamesuta.mc.bnnwidget.position.Area;
 import com.kamesuta.mc.bnnwidget.position.Coord;
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VCommon;
 import com.kamesuta.mc.bnnwidget.var.VMotion;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/OverlayFrame.java b/src/main/java/com/kamesuta/mc/signpic/gui/OverlayFrame.java
@@ -8,7 +8,6 @@
 import com.kamesuta.mc.bnnwidget.WEvent;
 import com.kamesuta.mc.bnnwidget.WFrame;
 import com.kamesuta.mc.bnnwidget.WPanel;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MLabel;
 import com.kamesuta.mc.bnnwidget.component.MScaledLabel;
 import com.kamesuta.mc.bnnwidget.motion.Easings;
@@ -17,6 +16,7 @@
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VCommon;
 import com.kamesuta.mc.bnnwidget.var.VMotion;

diff --git a/src/main/java/com/kamesuta/mc/signpic/gui/SignPicLabel.java b/src/main/java/com/kamesuta/mc/signpic/gui/SignPicLabel.java
@@ -9,11 +9,11 @@
 
 import com.kamesuta.mc.bnnwidget.WBase;
 import com.kamesuta.mc.bnnwidget.WEvent;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.position.Area;
 import com.kamesuta.mc.bnnwidget.position.Point;
 import com.kamesuta.mc.bnnwidget.position.R;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.signpic.attr.CompoundAttr;
 import com.kamesuta.mc.signpic.attr.prop.SizeData;
 import com.kamesuta.mc.signpic.attr.prop.SizeData.ImageSizes;

diff --git a/src/main/java/com/kamesuta/mc/signpic/handler/AnvilHandler.java b/src/main/java/com/kamesuta/mc/signpic/handler/AnvilHandler.java
@@ -7,12 +7,12 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.kamesuta.mc.bnnwidget.WGui;
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.component.MPanel;
 import com.kamesuta.mc.bnnwidget.motion.Easings;
 import com.kamesuta.mc.bnnwidget.position.Area;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WGui;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.bnnwidget.var.V;
 import com.kamesuta.mc.bnnwidget.var.VMotion;
 import com.kamesuta.mc.signpic.Log;

diff --git a/src/main/java/com/kamesuta/mc/signpic/image/Image.java b/src/main/java/com/kamesuta/mc/signpic/image/Image.java
@@ -5,9 +5,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.kamesuta.mc.bnnwidget.WRenderer;
-import com.kamesuta.mc.bnnwidget.WRenderer.BlendType;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
+import com.kamesuta.mc.bnnwidget.render.WRenderer.BlendType;
 import com.kamesuta.mc.signpic.Config;
 import com.kamesuta.mc.signpic.ILoadCancelable;
 import com.kamesuta.mc.signpic.attr.prop.SizeData;

diff --git a/src/main/java/com/kamesuta/mc/signpic/render/CustomTileEntitySignRenderer.java b/src/main/java/com/kamesuta/mc/signpic/render/CustomTileEntitySignRenderer.java
@@ -5,8 +5,8 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.signpic.Client;
 import com.kamesuta.mc.signpic.Config;
 import com.kamesuta.mc.signpic.attr.CompoundAttr;

diff --git a/src/main/java/com/kamesuta/mc/signpic/render/RenderHelper.java b/src/main/java/com/kamesuta/mc/signpic/render/RenderHelper.java
@@ -2,7 +2,7 @@
 
 import static org.lwjgl.opengl.GL11.*;
 
-import com.kamesuta.mc.bnnwidget.WRenderer;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 

diff --git a/src/main/java/com/kamesuta/mc/signpic/render/SignPicRender.java b/src/main/java/com/kamesuta/mc/signpic/render/SignPicRender.java
@@ -1,14 +1,14 @@
 package com.kamesuta.mc.signpic.render;
 
-import static com.kamesuta.mc.bnnwidget.WGui.*;
+import static com.kamesuta.mc.bnnwidget.render.WGui.*;
 import static org.lwjgl.opengl.GL11.*;
 
 import java.util.ArrayList;
 
 import javax.annotation.Nonnull;
 
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.signpic.Client;
 import com.kamesuta.mc.signpic.Config;
 import com.kamesuta.mc.signpic.CoreEvent;

diff --git a/src/main/java/com/kamesuta/mc/signpic/render/StateRender.java b/src/main/java/com/kamesuta/mc/signpic/render/StateRender.java
@@ -4,8 +4,8 @@
 
 import org.lwjgl.util.Color;
 
-import com.kamesuta.mc.bnnwidget.WRenderer;
 import com.kamesuta.mc.bnnwidget.render.OpenGL;
+import com.kamesuta.mc.bnnwidget.render.WRenderer;
 import com.kamesuta.mc.signpic.entry.content.Content;
 import com.kamesuta.mc.signpic.state.Progress;
+1 −1		README.md
+5 −0		src/api/java/com/kamesuta/mc/NonNullByDefault.java
+11 −0		src/api/java/com/kamesuta/mc/bnnwidget/ShortestFloatFormatter.java
+8 −0		src/api/java/com/kamesuta/mc/bnnwidget/StencilClip.java
+0 −7		src/api/java/com/kamesuta/mc/bnnwidget/WActionListener.java
+46 −0		src/api/java/com/kamesuta/mc/bnnwidget/WBase.java
+13 −0		src/api/java/com/kamesuta/mc/bnnwidget/WBox.java
+106 −0		src/api/java/com/kamesuta/mc/bnnwidget/WCommon.java
+6 −0		src/api/java/com/kamesuta/mc/bnnwidget/WComponent.java
+21 −0		src/api/java/com/kamesuta/mc/bnnwidget/WContainer.java
+22 −55		src/api/java/com/kamesuta/mc/bnnwidget/WEvent.java
+110 −3		src/api/java/com/kamesuta/mc/bnnwidget/WFrame.java
+0 −202		src/api/java/com/kamesuta/mc/bnnwidget/WGui.java
+45 −0		src/api/java/com/kamesuta/mc/bnnwidget/WList.java
+5 −0		src/api/java/com/kamesuta/mc/bnnwidget/WPanel.java
+29 −0		src/api/java/com/kamesuta/mc/bnnwidget/WTypedPanel.java
+19 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/FunnyButton.java
+99 −14		src/api/java/com/kamesuta/mc/bnnwidget/component/MButton.java
+138 −15		src/api/java/com/kamesuta/mc/bnnwidget/component/MChatTextField.java
+25 −1		src/api/java/com/kamesuta/mc/bnnwidget/component/MCheckBox.java
+117 −2		src/api/java/com/kamesuta/mc/bnnwidget/component/MLabel.java
+42 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MNumber.java
+16 −1		src/api/java/com/kamesuta/mc/bnnwidget/component/MPanel.java
+5 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MScaledLabel.java
+87 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MSelect.java
+42 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MSelectButton.java
+18 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MSelectField.java
+19 −1		src/api/java/com/kamesuta/mc/bnnwidget/component/MSelectLabel.java
+48 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/MTab.java
+3 −0		src/api/java/com/kamesuta/mc/bnnwidget/component/package-info.java
+50 −1		src/api/java/com/kamesuta/mc/bnnwidget/motion/CompoundMotion.java
+14 −0		src/api/java/com/kamesuta/mc/bnnwidget/motion/Easings.java
+71 −0		src/api/java/com/kamesuta/mc/bnnwidget/motion/ICompoundMotion.java
+56 −0		src/api/java/com/kamesuta/mc/bnnwidget/motion/IMotion.java
+60 −0		src/api/java/com/kamesuta/mc/bnnwidget/motion/Motion.java
+9 −0		src/api/java/com/kamesuta/mc/bnnwidget/motion/package-info.java
+7 −0		src/api/java/com/kamesuta/mc/bnnwidget/package-info.java
+86 −1		src/api/java/com/kamesuta/mc/bnnwidget/position/Area.java
+5 −0		src/api/java/com/kamesuta/mc/bnnwidget/position/Coord.java
+41 −2		src/api/java/com/kamesuta/mc/bnnwidget/position/Point.java
+103 −4		src/api/java/com/kamesuta/mc/bnnwidget/position/R.java
+7 −0		src/api/java/com/kamesuta/mc/bnnwidget/position/package-info.java
+7 −0		src/api/java/com/kamesuta/mc/bnnwidget/render/OpenGL.java
+486 −0		src/api/java/com/kamesuta/mc/bnnwidget/render/WGui.java
+52 −2		src/api/java/com/kamesuta/mc/bnnwidget/render/WRenderer.java
+5 −0		src/api/java/com/kamesuta/mc/bnnwidget/render/package-info.java
+25 −0		src/api/java/com/kamesuta/mc/bnnwidget/util/NotifyCollections.java
+3 −0		src/api/java/com/kamesuta/mc/bnnwidget/util/package-info.java
+58 −1		src/api/java/com/kamesuta/mc/bnnwidget/var/V.java
+5 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VBase.java
+17 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VCommon.java
+12 −1		src/api/java/com/kamesuta/mc/bnnwidget/var/VCompound.java
+8 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VMotion.java
+11 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VPercent.java
+11 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VRange.java
+20 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/VType.java
+7 −0		src/api/java/com/kamesuta/mc/bnnwidget/var/package-info.java