From 569e006c737f66c7eed32952226ba4e63000a01a Mon Sep 17 00:00:00 2001
From: Juuxel <6596629+Juuxel@users.noreply.github.com>
Date: Fri, 8 May 2020 19:32:56 +0300
Subject: Remove all deprecated members

---
 .../cottonmc/cotton/gui/widget/WClippedPanel.java  | 13 ---------
 .../cottonmc/cotton/gui/widget/WListPanel.java     |  8 -----
 .../github/cottonmc/cotton/gui/widget/WSlider.java |  5 ----
 .../cottonmc/cotton/gui/widget/WToggleButton.java  | 34 ----------------------
 4 files changed, 60 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WClippedPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WClippedPanel.java
index cf72c5b..ad93259 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WClippedPanel.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WClippedPanel.java
@@ -4,24 +4,11 @@ import net.minecraft.client.util.math.MatrixStack;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.util.Identifier;
 
 /**
  * A panel that is clipped to only render widgets inside its bounds.
  */
 public class WClippedPanel extends WPanel {
-	@Deprecated
-	protected Identifier mask;
-
-	/**
-	 * @deprecated {@code WClippedPanel} does not support clipping masks anymore.
-	 */
-	@Deprecated
-	public WClippedPanel setClippingMask(Identifier mask) {
-		this.mask = mask;
-		return this;
-	}
-	
 	@Override
 	public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
 		if (getBackgroundPainter()!=null) getBackgroundPainter().paintBackground(x, y, this);
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java
index a61371a..1d357c0 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WListPanel.java
@@ -61,14 +61,6 @@ public class WListPanel<D, W extends WWidget> extends WClippedPanel {
 		scrollBar.setMaxValue(data.size());
 		scrollBar.setParent(this);
 	}
-
-	/**
-	 * @deprecated Use {@link #WListPanel(List, Supplier, BiConsumer)} instead.
-	 */
-	@Deprecated
-	public WListPanel(List<D> data, Class<W> listItemClass, Supplier<W> supplier, BiConsumer<D, W> configurator) {
-		this(data, supplier, configurator);
-	}
 	
 	@Override
 	public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
index 11acfcd..f43736f 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
@@ -30,11 +30,6 @@ public class WSlider extends WAbstractSlider {
 		super(min, max, axis);
 	}
 
-	@Deprecated
-	public WSlider(int max, Axis axis) {
-		this(0, max, axis);
-	}
-
 	@Override
 	protected int getThumbWidth() {
 		return THUMB_SIZE;
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WToggleButton.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WToggleButton.java
index b5d58ef..87a9265 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WToggleButton.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WToggleButton.java
@@ -54,22 +54,6 @@ public class WToggleButton extends WWidget {
 		this.label = label;
 	}
 
-	/**
-	 * @deprecated Use {@link #WToggleButton(Identifier, Identifier)} instead.
-	 */
-	@Deprecated
-	public WToggleButton(Identifier onImage, Identifier offImage, int width, int height) {
-		this(onImage, offImage);
-	}
-
-	/**
-	 * @deprecated Use {@link #WToggleButton(Identifier, Identifier, Text)} instead.
-	 */
-	@Deprecated
-	public WToggleButton(Text label, Identifier onImage, Identifier offImage, int width, int height) {
-		this(onImage, offImage, label);
-	}
-
 	@Environment(EnvType.CLIENT)
 	@Override
 	public void paint(MatrixStack matrices, int x, int y, int mouseX, int mouseY) {
@@ -105,16 +89,6 @@ public class WToggleButton extends WWidget {
 	public boolean getToggle() { return this.isOn; }
 	public void setToggle(boolean on) { this.isOn = on; }
 
-	/**
-	 * Set on toggle handler
-	 *
-	 * @deprecated Use {@link #setOnToggle(Consumer)}
-	 */
-	@Deprecated
-	public void setOnToggle(Runnable r) {
-		this.onToggle = on -> r.run();
-	}
-
 	@Nullable
 	public Consumer<Boolean> getOnToggle() {
 		return this.onToggle;
@@ -135,14 +109,6 @@ public class WToggleButton extends WWidget {
 		return this;
 	}
 
-	/**
-	 * @deprecated Use {@link #setColor} instead.
-	 */
-	@Deprecated
-	public WToggleButton color(int light, int dark) {
-		return setColor(light, dark);
-	}
-
 	public WToggleButton setColor(int light, int dark) {
 		this.color = light;
 		this.darkmodeColor = dark;
-- 
cgit