From b0677bb66d6fd942b195f3a0b43402f85aec0fff Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Thu, 12 Aug 2021 23:35:11 +0200 Subject: [PATCH] Revert "Move decreeSystem into decreeCommand" This reverts commit 3d68caed6b578bca43848e2f95ce2102dacd25cc. --- .../iris/util/decree/DecreeCommand.java | 21 --------- .../iris/util/decree/DecreeParameter.java | 2 +- .../volmit/iris/util/decree/DecreeSystem.java | 43 +++++++++++++++++++ 3 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/volmit/iris/util/decree/DecreeSystem.java diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeCommand.java b/src/main/java/com/volmit/iris/util/decree/DecreeCommand.java index 58486e367..255190726 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeCommand.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeCommand.java @@ -18,26 +18,5 @@ package com.volmit.iris.util.decree; -import com.volmit.iris.Iris; -import com.volmit.iris.util.collection.KList; - public class DecreeCommand { - private static final KList> handlers = Iris.initialize("com.volmit.iris.util.decree.handlers", null).convert((i) -> (DecreeParameterHandler) i); - - /** - * Get the handler for the specified type - * @param type The type to handle - * @return The corresponding {@link DecreeParameterHandler}, or null - */ - public static DecreeParameterHandler getHandler(Class type) - { - for(DecreeParameterHandler i : handlers) - { - if(i.supports(type)) - { - return i; - } - } - return null; - } } diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java index 7e2a6dfca..de55ba881 100644 --- a/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java +++ b/src/main/java/com/volmit/iris/util/decree/DecreeParameter.java @@ -38,7 +38,7 @@ public class DecreeParameter { } public DecreeParameterHandler getHandler() { - return DecreeCommand.getHandler(getType()); + return DecreeSystem.getHandler(getType()); } public Class getType() { diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java b/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java new file mode 100644 index 000000000..2eb987ab5 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/decree/DecreeSystem.java @@ -0,0 +1,43 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.util.decree; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KList; + +public class DecreeSystem { + private static final KList> handlers = Iris.initialize("com.volmit.iris.util.decree.handlers", null).convert((i) -> (DecreeParameterHandler) i); + + /** + * Get the handler for the specified type + * @param type The type to handle + * @return The corresponding {@link DecreeParameterHandler}, or null + */ + public static DecreeParameterHandler getHandler(Class type) + { + for(DecreeParameterHandler i : handlers) + { + if(i.supports(type)) + { + return i; + } + } + return null; + } +}