From 85dcea8375d2f04ce53ff5ea82a4743b6bf1485a Mon Sep 17 00:00:00 2001 From: Dams4K Date: Mon, 16 May 2022 19:51:23 +0200 Subject: [PATCH] i think i know how to use branchs --- .../core/colorchooser/ColorChooserFrame.java | 41 ------ .../core/colorchooser/ImageGenerators.java | 36 ----- .../selectors/HColorSelector.java | 26 ---- .../selectors/SBColorSelector.java | 28 ---- .../colorchooser/selectors/SelectorBase.java | 138 ------------------ .../core/colorchooser/sliders/BaseSlider.java | 18 --- .../sliders/SlidersContainer.java | 22 --- src/main/java/fr/dams4k/cpsmod/core/proto.py | 15 -- .../fr/dams4k/cpsmod/v1_8/gui/GuiConfig.java | 59 +------- 9 files changed, 8 insertions(+), 375 deletions(-) delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/ColorChooserFrame.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/ImageGenerators.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/HColorSelector.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SBColorSelector.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SelectorBase.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/BaseSlider.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/SlidersContainer.java delete mode 100644 src/main/java/fr/dams4k/cpsmod/core/proto.py diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ColorChooserFrame.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ColorChooserFrame.java deleted file mode 100644 index ffe82ce..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ColorChooserFrame.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser; - -import java.awt.Dimension; - -import javax.swing.BoxLayout; -import javax.swing.JFrame; -import javax.swing.JPanel; - -import fr.dams4k.cpsmod.core.colorchooser.selectors.HColorSelector; -import fr.dams4k.cpsmod.core.colorchooser.selectors.SBColorSelector; -import fr.dams4k.cpsmod.core.colorchooser.sliders.SlidersContainer; - -public class ColorChooserFrame extends JFrame { - public ColorChooserFrame() { - JPanel mainPanel = new JPanel(); - mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS)); - - JPanel colorWheelPanel = new JPanel(); - colorWheelPanel.setLayout(new BoxLayout(colorWheelPanel, BoxLayout.X_AXIS)); - - SBColorSelector sbColorSelector = new SBColorSelector(ImageGenerators.sbColorSelector(0f)); - HColorSelector hColorSelector = new HColorSelector(ImageGenerators.hColorSelector(), sbColorSelector, 0f); - colorWheelPanel.add(sbColorSelector); - colorWheelPanel.add(hColorSelector); - - JPanel colorSliders = new SlidersContainer(); - - mainPanel.add(colorWheelPanel); - mainPanel.add(colorSliders); - - add(mainPanel); - - setSize(new Dimension(326, 400)); - setMinimumSize(new Dimension(326, 400)); - setLocationRelativeTo(null); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - setTitle("Color Chooser"); - setVisible(true); - } - -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ImageGenerators.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ImageGenerators.java deleted file mode 100644 index a9f66a7..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/ImageGenerators.java +++ /dev/null @@ -1,36 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser; - -import java.awt.Color; -import java.awt.image.BufferedImage; - -public class ImageGenerators { - public static BufferedImage sbColorSelector(float h) { - int size_x = 255; - int size_y = 255; - BufferedImage imageOut = new BufferedImage(size_x, size_y, BufferedImage.TYPE_INT_RGB); - - for (int y = 0; y < size_y; y++) { - for (int x = 0; x < size_x; x++) { - int rgb = Color.HSBtoRGB(h, x/((float) size_x+1), 1f-y/((float) size_y+1)); - imageOut.setRGB(x, y, rgb); - } - } - - return imageOut; - } - - public static BufferedImage hColorSelector() { - int size_x = 25; - int size_y = 255; - BufferedImage imageOut = new BufferedImage(size_x, size_y, BufferedImage.TYPE_INT_RGB); - - for (int y = 0; y < size_y; y++) { - for (int x = 0; x < size_x; x++) { - int rgb = Color.HSBtoRGB(y/((float) size_y+1), 1f, 1f); - imageOut.setRGB(x, y, rgb); - } - } - - return imageOut; - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/HColorSelector.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/HColorSelector.java deleted file mode 100644 index 34a0bd1..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/HColorSelector.java +++ /dev/null @@ -1,26 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser.selectors; - -import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; - -public class HColorSelector extends SelectorBase { - private SBColorSelector sbColorSelector; - private float H = 0f; - - public HColorSelector(BufferedImage baseBufferedImage, SBColorSelector sbColorSelector, float H) { - super(baseBufferedImage, true, false); - - this.sbColorSelector = sbColorSelector; - this.H = H; - - updateIcon(0, (int) this.H * getBaseBufferedImage().getHeight()); - } - - @Override - public void updateIcon(MouseEvent event) { - super.updateIcon(event); - - this.H = this.clamp(event.getY(), 0, 255) / (float) this.getIcon().getIconHeight(); - this.sbColorSelector.refreshIcon(this.H); - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SBColorSelector.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SBColorSelector.java deleted file mode 100644 index 0a77112..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SBColorSelector.java +++ /dev/null @@ -1,28 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser.selectors; - -import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; - -import fr.dams4k.cpsmod.core.colorchooser.ImageGenerators; - -public class SBColorSelector extends SelectorBase { - float S; - float B; - - public SBColorSelector(BufferedImage baseBufferedImage) { - super(baseBufferedImage, true, true); - updateIcon(0, 0); - } - - public void refreshIcon(float H) { - setBaseBufferedImage(ImageGenerators.sbColorSelector(H)); - } - - @Override - public void updateIcon(MouseEvent event) { - super.updateIcon(event); - - this.S = this.clamp(event.getX(), 0, 255) / (float) this.getIcon().getIconWidth(); - this.B = this.clamp(event.getY(), 0, 255) / (float) this.getIcon().getIconHeight(); - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SelectorBase.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SelectorBase.java deleted file mode 100644 index d34756d..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/selectors/SelectorBase.java +++ /dev/null @@ -1,138 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser.selectors; - -import java.awt.Color; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.WritableRaster; - -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.border.EmptyBorder; - -public class SelectorBase extends JLabel implements MouseMotionListener, MouseListener { - private BufferedImage baseBufferedImage; - - private boolean showXAxis; - private boolean showYAxis; - - private int selectX; - private int selectY; - - private Color inlineColor = Color.BLACK; - private Color outlineColor = Color.WHITE; - - public SelectorBase(BufferedImage baseBufferedImage, boolean showXAxis, boolean showYAxis) { - super(new ImageIcon(baseBufferedImage)); - setBorder(new EmptyBorder(5, 5, 5, 5)); - - this.baseBufferedImage = baseBufferedImage; - this.showXAxis = showXAxis; - this.showYAxis = showYAxis; - - addMouseMotionListener(this); - addMouseListener(this); - } - - @Override - public void mouseDragged(MouseEvent event) { - this.updateIcon(event); - } - - @Override - public void mouseMoved(MouseEvent event) { - } - - @Override - public void mouseClicked(MouseEvent event) { - this.updateIcon(event); - } - - @Override - public void mouseEntered(MouseEvent event) { - } - - @Override - public void mouseExited(MouseEvent event) { - } - - @Override - public void mousePressed(MouseEvent event) { - } - - @Override - public void mouseReleased(MouseEvent event) { - } - - public void updateIcon(MouseEvent event) { - this.selectX = event.getX(); - this.selectY = event.getY(); - - this.setIcon(new ImageIcon(this.bufferedImageGenAxis(selectX, selectY))); - } - - public void updateIcon(int selectX, int selectY) { - this.selectX = selectX; - this.selectY = selectY; - - this.setIcon(new ImageIcon(this.bufferedImageGenAxis(selectX, selectY))); - } - - public BufferedImage bufferedImageGenAxis(int event_x, int event_y) { - BufferedImage newBufferedImage = this.copyBuffered(baseBufferedImage); - - if (this.showXAxis) { - for (int x = 0; x < newBufferedImage.getWidth(); x++) { - newBufferedImage.setRGB(x, clamp(event_y, 0, newBufferedImage.getHeight() - 1), inlineColor.getRGB()); - - if (event_y - 1 >= 0 && (x != event_x || !this.showYAxis)) { - newBufferedImage.setRGB(x, clamp(event_y - 1, 0, newBufferedImage.getHeight() - 1), - outlineColor.getRGB()); - } - if (event_y + 1 < newBufferedImage.getHeight() - 1 && (x != event_x || !this.showYAxis)) { - newBufferedImage.setRGB(x, clamp(event_y + 1, 0, newBufferedImage.getHeight() - 1), - outlineColor.getRGB()); - } - } - } - - if (this.showYAxis) { - for (int y = 0; y < newBufferedImage.getWidth(); y++) { - newBufferedImage.setRGB(clamp(event_x, 0, newBufferedImage.getWidth() - 1), y, inlineColor.getRGB()); - - if (event_x - 1 >= 0 && (y != event_y || !this.showXAxis)) { - newBufferedImage.setRGB(clamp(event_x - 1, 0, newBufferedImage.getWidth() - 1), y, - outlineColor.getRGB()); - } - if (event_x + 1 < newBufferedImage.getWidth() - 1 && (y != event_y || !this.showXAxis)) { - newBufferedImage.setRGB(clamp(event_x + 1, 0, newBufferedImage.getWidth() - 1), y, - outlineColor.getRGB()); - } - } - } - - return newBufferedImage; - } - - public BufferedImage copyBuffered(BufferedImage bufferedImage) { - ColorModel colorModel = bufferedImage.getColorModel(); - boolean isAlphaPremultiplied = colorModel.isAlphaPremultiplied(); - WritableRaster raster = bufferedImage.copyData(null); - return new BufferedImage(colorModel, raster, isAlphaPremultiplied, null); - } - - public int clamp(int value, int min, int max) { - return Math.max(min, Math.min(max, value)); - } - - public void setBaseBufferedImage(BufferedImage baseBufferedImage) { - this.baseBufferedImage = baseBufferedImage; - this.setIcon(new ImageIcon(this.bufferedImageGenAxis(this.selectX, this.selectY))); - } - - public BufferedImage getBaseBufferedImage() { - return baseBufferedImage; - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/BaseSlider.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/BaseSlider.java deleted file mode 100644 index 49c3823..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/BaseSlider.java +++ /dev/null @@ -1,18 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser.sliders; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JSlider; - -public class BaseSlider extends JPanel { - public JLabel label; - public JSlider slider; - - public BaseSlider(String label_name) { - this.label = new JLabel(label_name); - this.slider = new JSlider(0, 255, 0); - - add(label); - add(slider); - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/SlidersContainer.java b/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/SlidersContainer.java deleted file mode 100644 index 4c3cb91..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/colorchooser/sliders/SlidersContainer.java +++ /dev/null @@ -1,22 +0,0 @@ -package fr.dams4k.cpsmod.core.colorchooser.sliders; - -import java.awt.CardLayout; - -import javax.swing.BoxLayout; -import javax.swing.JPanel; -import javax.swing.border.EmptyBorder; - -public class SlidersContainer extends JPanel { - public SlidersContainer() { - setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - setBorder(new EmptyBorder(5, 5, 5, 5)); - - BaseSlider redSlider = new BaseSlider("red :"); - BaseSlider greenSlider = new BaseSlider("green :"); - BaseSlider blueSlider = new BaseSlider("blue :"); - - add(redSlider); - add(greenSlider); - add(blueSlider); - } -} diff --git a/src/main/java/fr/dams4k/cpsmod/core/proto.py b/src/main/java/fr/dams4k/cpsmod/core/proto.py deleted file mode 100644 index 43c486b..0000000 --- a/src/main/java/fr/dams4k/cpsmod/core/proto.py +++ /dev/null @@ -1,15 +0,0 @@ -from PIL import Image -import colorsys - -def hsv2rgb(h,s,v): - return tuple(round(i * 255) for i in colorsys.hsv_to_rgb(h,s,v)) - -size = (255, 255) - -img = Image.new("RGB", size) - -for y in range(size[1]): - for x in range(size[0]): - img.putpixel((x, y), hsv2rgb(0, x/(size[0]+1), 1-y/(size[1]+1))) - -img.show() \ No newline at end of file diff --git a/src/main/java/fr/dams4k/cpsmod/v1_8/gui/GuiConfig.java b/src/main/java/fr/dams4k/cpsmod/v1_8/gui/GuiConfig.java index 6608766..5940747 100644 --- a/src/main/java/fr/dams4k/cpsmod/v1_8/gui/GuiConfig.java +++ b/src/main/java/fr/dams4k/cpsmod/v1_8/gui/GuiConfig.java @@ -4,27 +4,24 @@ import java.io.IOException; import java.util.ArrayList; -import fr.dams4k.cpsmod.core.colorchooser.ColorChooserFrame; import fr.dams4k.cpsmod.v1_8.config.ModConfig; import fr.dams4k.cpsmod.v1_8.enums.ColorsEnum; import fr.dams4k.cpsmod.v1_8.enums.MouseModeEnum; import fr.dams4k.cpsmod.v1_8.enums.ShowTextEnum; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiSlider.FormatHelper; import net.minecraft.client.gui.GuiTextField; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.client.config.GuiButtonExt; import net.minecraftforge.fml.client.config.GuiSlider; - public class GuiConfig extends GuiScreen { // Text - private GuiButton showTextButton; + private GuiButtonExt showTextButton; private GuiSlider scaleSlider; - private GuiButton baseColorChangerButton; - private GuiButton mouseModeChangerButton; + private GuiButtonExt baseColorChangerButton; + private GuiButtonExt mouseModeChangerButton; private GuiTextField textField; private GuiTextField colorField; @@ -52,15 +49,15 @@ public void initGui() { if (ModConfig.rainbow) { colorSelected = ColorsEnum.getById(9); } - - showTextButton = new GuiButton(0, width / 2 - 152, 10 + top, 150, 20, "Show text: " + showText.getText()); + + showTextButton = new GuiButtonExt(0, width / 2 - 152, 10 + top, 150, 20, "Show text: " + showText.getText()); scaleSlider = new GuiSlider(1, width / 2 - 152, 35 + top, 150, 20, "Scale : ", "%", 0.5 * 100, 4 * 100, ModConfig.text_scale * 100, false, true); - mouseModeChangerButton = new GuiButton(3, width / 2 - 152, 60 + top, 150, 20, "Display mode: " + mouseModeSelected.getName()); + mouseModeChangerButton = new GuiButtonExt(3, width / 2 - 152, 60 + top, 150, 20, "Display mode: " + mouseModeSelected.getName()); textField = new GuiTextField(2, fontRendererObj, width / 2 - 152, 85 + top, 150, 20); textField.setMaxStringLength(999); textField.setText(ModConfig.text); - baseColorChangerButton = new GuiButton(10, width / 2 + 2, 10 + top, 150, 20, "Color: " + colorSelected.getName()); + baseColorChangerButton = new GuiButtonExt(10, width / 2 + 2, 10 + top, 150, 20, "Color: " + colorSelected.getName()); colorField = new GuiTextField(11, fontRendererObj, width / 2 + 2, 35 + top, 150, 20); colorField.setMaxStringLength(6); colorField.setText(ModConfig.text_color); @@ -68,43 +65,6 @@ public void initGui() { rainbowSpeedSlider = new GuiSlider(13, width / 2 + 2, 60 + top, 150, 20, "Speed: ", "x", 0.1, 3f, ModConfig.rainbow_speed, true, true); rainbowPrecisionSlider = new GuiSlider(14, width / 2 + 2, 85 + top, 150, 20, "Precision: ", "", 0.01, 1, ModConfig.rainbow_precision, true, true); - net.minecraft.client.gui.GuiSlider testSlider = new net.minecraft.client.gui.GuiSlider(new GuiResponder() { - - @Override - public void func_175321_a(int p_175321_1_, boolean p_175321_2_) { - System.out.println("- func_175321_a"); - System.out.println(p_175321_1_); - System.out.println(p_175321_2_); - } - - @Override - public void onTick(int id, float value) { - System.out.println("- onTick"); - System.out.println(id); - System.out.println(value); - } - - @Override - public void func_175319_a(int p_175319_1_, String p_175319_2_) { - System.out.println("- func_175319_a"); - System.out.println(p_175319_1_); - System.out.println(p_175319_2_); - } - - }, 100, 0, 0, "Slider", 0, 100, 50, new FormatHelper() { - - @Override - public String getText(int id, String name, float value) { - System.out.println("- getText"); - System.out.println(id); - System.out.println(name); - System.out.println(value); - return null; - } - - }); - buttonList.add(testSlider); - buttonList.add(showTextButton); buttonList.add(scaleSlider); buttonList.add(mouseModeChangerButton); @@ -113,8 +73,6 @@ public String getText(int id, String name, float value) { buttonList.add(rainbowSpeedSlider); buttonList.add(rainbowPrecisionSlider); - ColorChooserFrame colorWindow = new ColorChooserFrame(); - updateButtons(); } @@ -220,7 +178,6 @@ protected void actionPerformed(GuiButton button) throws IOException { showText = ShowTextEnum.getByBool(!showText.getBool()); showTextButton.displayString = "Show text: " + showText.getText(); } - saveConfig(); }