From 917d674f21cbe0927bce3202bfe04fb31e215b87 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 30 May 2022 11:56:19 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Add=20deadline=20to=20autopr=C3=BCfer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schematicsystem/CheckSchemType.java | 26 +++++++++++++++++++ .../commands/SchematicCommandUtils.java | 8 +++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java index 9af5cee..257c466 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java @@ -30,6 +30,10 @@ import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.Instant; import java.util.*; import java.util.logging.Level; @@ -45,6 +49,8 @@ public class CheckSchemType { private final Map, Integer> limits; private final int maxBlocks; + private final Date deadline; + private CheckSchemType(ConfigurationSection section) { String name = section.getString("Schematic.Type"); width = section.getInt("Schematic.Size.x"); @@ -65,6 +71,18 @@ public class CheckSchemType { } } + String deadlineString = section.getString("deadline", null); + if (deadlineString != null) { + try { + SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm"); + deadline = dateFormat.parse(deadlineString); + } catch (ParseException e) { + throw new SecurityException(e.getMessage(), e); + } + } else { + deadline = null; + } + types.put(SchematicType.fromDB(name.toLowerCase()), this); types.put(SchematicType.fromDB("c" + name.toLowerCase()), this); } @@ -126,6 +144,14 @@ public class CheckSchemType { return new HashMap<>(limits); } + public boolean isAfterDeadline() { + return deadline != null && deadline.before(Date.from(Instant.now())); + } + + public String getDeadline() { + return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, Locale.GERMAN).format(deadline); + } + public static final ICheckSchemType impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance()); diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java index ea92be3..b5fc0e9 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java @@ -392,7 +392,13 @@ public class SchematicCommandUtils { return; } - AutoCheckResult result = CheckSchemType.get(type).autoCheck(node); + CheckSchemType checkSchemType = CheckSchemType.get(type); + if (checkSchemType.isAfterDeadline()) { + player.sendMessage("§cVon diesem Typen können keine Schematics mehr eingesendet werden. Einsendeschluss war: " + checkSchemType.getDeadline()); + return; + } + + AutoCheckResult result = checkSchemType.autoCheck(node); Collection errors = result.errors(); for (String warning : result.warnings()) { player.sendMessage(" §e" + warning); From b3d281e189249491426b1f008683e4a42d1fa70b Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 30 May 2022 12:59:30 +0200 Subject: [PATCH 2/3] Rebuild --- SchematicSystem_Core/src/plugin.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/SchematicSystem_Core/src/plugin.yml b/SchematicSystem_Core/src/plugin.yml index b756bec..b125335 100644 --- a/SchematicSystem_Core/src/plugin.yml +++ b/SchematicSystem_Core/src/plugin.yml @@ -6,5 +6,3 @@ main: de.steamwar.schematicsystem.SchematicSystem website: steamwar.de api-version: "1.13" description: Schematic-Frontend - -commands: From 39f25462ff40513eb138234cd85c244f910eb645 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 30 May 2022 13:10:02 +0200 Subject: [PATCH 3/3] Fix SchematicCommand --- .../schematicsystem/commands/SchematicCommand.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java index c3acd21..06c7c4e 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java @@ -19,6 +19,7 @@ package de.steamwar.schematicsystem.commands; +import de.steamwar.command.AbstractTypeMapper; import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommandUtils; import de.steamwar.command.TypeMapper; @@ -49,7 +50,7 @@ import static de.steamwar.schematicsystem.commands.SchematicCommandUtils.*; public class SchematicCommand extends SWCommand { - private static final Map> searchMapper = new HashMap<>(); + private static final Map> searchMapper = new HashMap<>(); static { searchMapper.put("-type", SWCommandUtils.createMapper(SchematicType.values().stream().map(SchematicType::name).toArray(String[]::new))); @@ -657,8 +658,8 @@ public class SchematicCommand extends SWCommand { public TypeMapper publicDirNodeTypeMapper() { return new TypeMapper() { @Override - public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - List list = publicCommandTypeMapper.tabCompletes(commandSender, strings, s); + public Collection tabCompletes(CommandSender commandSender, String[] strings, String s) { + Collection list = publicCommandTypeMapper.tabCompletes(commandSender, strings, s); list.removeIf(s1 -> !s1.endsWith("/")); return list; } @@ -731,7 +732,7 @@ public class SchematicCommand extends SWCommand { } @Override - public List tabCompletes(CommandSender commandSender, String[] strings, String s) { + public Collection tabCompletes(CommandSender commandSender, String[] strings, String s) { if (strings.length == 0) { List list = new ArrayList<>(); list.add(s); @@ -740,7 +741,7 @@ public class SchematicCommand extends SWCommand { } String last = strings[strings.length - 1]; if (searchMapper.containsKey(last)) { - TypeMapper mapper = searchMapper.get(last); + AbstractTypeMapper mapper = searchMapper.get(last); if (mapper == null) { List list = new ArrayList<>(searchMapper.keySet()); list.add(s);