From 915e1308eb480564dd73abfacead1109f1a10669 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 29 Jun 2025 21:41:29 +0400 Subject: [PATCH] refactor: removed unused and outdated code --- .../mage/cards/action/impl/EmptyCallback.java | 63 ---------------- .../mage/filters/MageBufferedImageOp.java | 72 ------------------- .../java/mage/utils/ActionWithUUIDResult.java | 11 --- .../server/challenge/ChallengeManager.java | 25 ------- .../exceptions/UserNotFoundException.java | 7 -- .../mage/server/managers/ChatManager.java | 1 - .../java/mage/server/services/LogService.java | 18 ----- .../mage/server/services/MageService.java | 18 ----- .../mage/abilities/costs/AbilityCosts.java | 15 ---- .../main/java/mage/game/events/MageEvent.java | 13 ---- 10 files changed, 243 deletions(-) delete mode 100644 Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java delete mode 100644 Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java delete mode 100644 Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java delete mode 100644 Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java delete mode 100644 Mage.Server/src/main/java/mage/server/exceptions/UserNotFoundException.java delete mode 100644 Mage.Server/src/main/java/mage/server/services/LogService.java delete mode 100644 Mage.Server/src/main/java/mage/server/services/MageService.java delete mode 100644 Mage/src/main/java/mage/abilities/costs/AbilityCosts.java delete mode 100644 Mage/src/main/java/mage/game/events/MageEvent.java diff --git a/Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java b/Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java deleted file mode 100644 index 3da223590e6..00000000000 --- a/Mage.Common/src/main/java/mage/cards/action/impl/EmptyCallback.java +++ /dev/null @@ -1,63 +0,0 @@ -package mage.cards.action.impl; - -import mage.cards.action.ActionCallback; -import mage.cards.action.TransferData; - -import java.awt.*; -import java.awt.event.MouseEvent; -import java.awt.event.MouseWheelEvent; - -/** - * Callback that does nothing on any action - * - * @author nantuko84 - */ -public class EmptyCallback implements ActionCallback { - - @Override - public void mouseMoved(MouseEvent e, TransferData data) { - } - - @Override - public void mouseDragged(MouseEvent e, TransferData data) { - - } - - @Override - public void mouseEntered(MouseEvent e, TransferData data) { - } - - @Override - public void mouseExited(MouseEvent e, TransferData data) { - } - - @Override - public void mouseWheelMoved(int mouseWheelRotation, TransferData data) { - } - - @Override - public void hideOpenComponents() { - } - - @Override - public void mouseClicked(MouseEvent e, TransferData data, boolean doubleClick) { - } - - @Override - public void mousePressed(MouseEvent e, TransferData data) { - } - - @Override - public void mouseReleased(MouseEvent e, TransferData data) { - } - - @Override - public void popupMenuCard(MouseEvent e, TransferData data) { - - } - - @Override - public void popupMenuPanel(MouseEvent e, Component sourceComponent) { - - } -} diff --git a/Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java b/Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java deleted file mode 100644 index f6adc23d756..00000000000 --- a/Mage.Common/src/main/java/mage/filters/MageBufferedImageOp.java +++ /dev/null @@ -1,72 +0,0 @@ -package mage.filters; - -import java.awt.*; -import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; -import java.awt.image.ColorModel; - -/** - * Mage abstract class that implements single-input/single-output - * operations performed on {@link java.awt.image.BufferedImage}. - * - * @author nantuko - */ -public abstract class MageBufferedImageOp implements BufferedImageOp { - - /** - * Creates compatible image for @param src image. - */ - @Override - public BufferedImage createCompatibleDestImage(BufferedImage src, ColorModel dest) { - if (dest == null) { - dest = src.getColorModel(); - } - return new BufferedImage(dest, dest.createCompatibleWritableRaster(src.getWidth(), src.getHeight()), dest.isAlphaPremultiplied(), null); - } - - @Override - public RenderingHints getRenderingHints() { - return null; - } - - @Override - public Rectangle2D getBounds2D(BufferedImage src) { - return new Rectangle(0, 0, src.getWidth(), src.getHeight()); - } - - @Override - public Point2D getPoint2D(Point2D srcPt, Point2D destPt) { - if (destPt == null) { - destPt = new Point2D.Double(); - } - destPt.setLocation(srcPt.getX(), srcPt.getY()); - return destPt; - } - - /** - * Gets ARGB pixels from image. Solves the performance - * issue of BufferedImage.getRGB method. - */ - public int[] getRGB(BufferedImage image, int x, int y, int width, int height, int[] pixels) { - int type = image.getType(); - if (type == BufferedImage.TYPE_INT_ARGB || type == BufferedImage.TYPE_INT_RGB) { - return (int[]) image.getRaster().getDataElements(x, y, width, height, pixels); - } - return image.getRGB(x, y, width, height, pixels, 0, width); - } - - /** - * Sets ARGB pixels in image. Solves the performance - * issue of BufferedImage.setRGB method. - */ - public void setRGB(BufferedImage image, int x, int y, int width, int height, int[] pixels) { - int type = image.getType(); - if (type == BufferedImage.TYPE_INT_ARGB || type == BufferedImage.TYPE_INT_RGB) { - image.getRaster().setDataElements(x, y, width, height, pixels); - } else { - image.setRGB(x, y, width, height, pixels, 0, width); - } - } -} diff --git a/Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java b/Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java deleted file mode 100644 index 1133a0bde24..00000000000 --- a/Mage.Common/src/main/java/mage/utils/ActionWithUUIDResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package mage.utils; - -import mage.view.TableView; - -/** - * Used to write less code for ActionWithResult anonymous classes with UUID return type. - * - * @author noxx - */ -public abstract class ActionWithUUIDResult extends ActionWithNullNegativeResult { -} diff --git a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java b/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java deleted file mode 100644 index 1c9b4f57777..00000000000 --- a/Mage.Server/src/main/java/mage/server/challenge/ChallengeManager.java +++ /dev/null @@ -1,25 +0,0 @@ -package mage.server.challenge; - -import mage.constants.Zone; -import mage.game.match.Match; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -/** - * C U R R E N T L Y U N U S E D - * - * Loads challenges from scenarios. - * Configure games by initializing starting game board. - */ -public enum ChallengeManager { - - instance; - - public void prepareChallenge(UUID playerId, Match match) { - Map commands = new HashMap<>(); - commands.put(Zone.OUTSIDE, "life:3"); - match.getGame().cheat(playerId, commands); - } -} diff --git a/Mage.Server/src/main/java/mage/server/exceptions/UserNotFoundException.java b/Mage.Server/src/main/java/mage/server/exceptions/UserNotFoundException.java deleted file mode 100644 index 5787b42f6d5..00000000000 --- a/Mage.Server/src/main/java/mage/server/exceptions/UserNotFoundException.java +++ /dev/null @@ -1,7 +0,0 @@ -package mage.server.exceptions; - -/** - * Created by igoudt on 14-1-2017. - */ -public class UserNotFoundException extends Exception { -} diff --git a/Mage.Server/src/main/java/mage/server/managers/ChatManager.java b/Mage.Server/src/main/java/mage/server/managers/ChatManager.java index 7319561890d..bf9fcb0e0dd 100644 --- a/Mage.Server/src/main/java/mage/server/managers/ChatManager.java +++ b/Mage.Server/src/main/java/mage/server/managers/ChatManager.java @@ -3,7 +3,6 @@ package mage.server.managers; import mage.game.Game; import mage.server.ChatSession; import mage.server.DisconnectReason; -import mage.server.exceptions.UserNotFoundException; import mage.view.ChatMessage; import java.util.List; diff --git a/Mage.Server/src/main/java/mage/server/services/LogService.java b/Mage.Server/src/main/java/mage/server/services/LogService.java deleted file mode 100644 index b0edcdfba49..00000000000 --- a/Mage.Server/src/main/java/mage/server/services/LogService.java +++ /dev/null @@ -1,18 +0,0 @@ -package mage.server.services; - -/** - * Responsible for gathering logs and storing them in DB. - * - * @author noxx - */ -@FunctionalInterface -public interface LogService { - - /** - * Logs any information - * - * @param key Log key. Should be the same for the same types of logs. - * @param args Any parameters in string representation. - */ - void log(String key, String... args); -} diff --git a/Mage.Server/src/main/java/mage/server/services/MageService.java b/Mage.Server/src/main/java/mage/server/services/MageService.java deleted file mode 100644 index d80d7568d7e..00000000000 --- a/Mage.Server/src/main/java/mage/server/services/MageService.java +++ /dev/null @@ -1,18 +0,0 @@ -package mage.server.services; - -/** - * Common interface for all services. - * - * @author noxx - */ -public interface MageService { - /** - * Restores data on startup. - */ - void initService(); - - /** - * Dumps data to DB. - */ - void saveData(); -} diff --git a/Mage/src/main/java/mage/abilities/costs/AbilityCosts.java b/Mage/src/main/java/mage/abilities/costs/AbilityCosts.java deleted file mode 100644 index a63ebc1b81a..00000000000 --- a/Mage/src/main/java/mage/abilities/costs/AbilityCosts.java +++ /dev/null @@ -1,15 +0,0 @@ - - -package mage.abilities.costs; - -import java.io.Serializable; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public class AbilityCosts implements Serializable { - - - -} diff --git a/Mage/src/main/java/mage/game/events/MageEvent.java b/Mage/src/main/java/mage/game/events/MageEvent.java deleted file mode 100644 index 540890dc3e7..00000000000 --- a/Mage/src/main/java/mage/game/events/MageEvent.java +++ /dev/null @@ -1,13 +0,0 @@ - - -package mage.game.events; - -import java.io.Serializable; - -/** - * - * @author BetaSteward_at_googlemail.com - */ -public interface MageEvent extends Serializable { - -}