From 5f70d4c7bcaa8f96b5a00d846b839963488da035 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Sat, 4 Dec 2021 11:03:11 +0100 Subject: [PATCH] Hotfix gradle-wrapper.properties and update lombok Fix TraceCommand not compiling Signed-off-by: yoyosource --- BauSystem_15/build.gradle | 8 ++++---- BauSystem_API/build.gradle | 8 ++++---- BauSystem_Main/build.gradle | 16 ++++++++-------- .../bausystem/features/tracer/TraceCommand.java | 15 ++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/BauSystem_15/build.gradle b/BauSystem_15/build.gradle index 9ebd5f56..48ff7ae9 100644 --- a/BauSystem_15/build.gradle +++ b/BauSystem_15/build.gradle @@ -43,10 +43,10 @@ sourceSets { } dependencies { - compileOnly 'org.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' + compileOnly 'org.projectlombok:lombok:1.18.22' + testCompileOnly 'org.projectlombok:lombok:1.18.22' + annotationProcessor 'org.projectlombok:lombok:1.18.22' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' implementation project(":BauSystem_API") diff --git a/BauSystem_API/build.gradle b/BauSystem_API/build.gradle index c8ee702d..19035278 100644 --- a/BauSystem_API/build.gradle +++ b/BauSystem_API/build.gradle @@ -43,10 +43,10 @@ sourceSets { } dependencies { - compileOnly 'org.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' + compileOnly 'org.projectlombok:lombok:1.18.22' + testCompileOnly 'org.projectlombok:lombok:1.18.22' + annotationProcessor 'org.projectlombok:lombok:1.18.22' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' compileOnly files("${projectDir}/../lib/Spigot-1.15.jar") } \ No newline at end of file diff --git a/BauSystem_Main/build.gradle b/BauSystem_Main/build.gradle index 32d7760b..1b2cd5c3 100644 --- a/BauSystem_Main/build.gradle +++ b/BauSystem_Main/build.gradle @@ -49,15 +49,15 @@ dependencies { implementation 'yoyosource:YAPION:0.25.3' // implementation files("${projectDir}/../lib/YAPION-SNAPSHOT.jar") - compileOnly 'org.projectlombok:lombok:1.18.6' - testCompileOnly 'org.projectlombok:lombok:1.18.6' - annotationProcessor 'org.projectlombok:lombok:1.18.6' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.6' + compileOnly 'org.projectlombok:lombok:1.18.22' + testCompileOnly 'org.projectlombok:lombok:1.18.22' + annotationProcessor 'org.projectlombok:lombok:1.18.22' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' - implementation 'org.atteo.classindex:classindex:3.4' - testImplementation 'org.atteo.classindex:classindex:3.4' - annotationProcessor 'org.atteo.classindex:classindex:3.4' - testAnnotationProcessor 'org.atteo.classindex:classindex:3.4' + implementation 'org.atteo.classindex:classindex:3.11' + testImplementation 'org.atteo.classindex:classindex:3.11' + annotationProcessor 'org.atteo.classindex:classindex:3.11' + testAnnotationProcessor 'org.atteo.classindex:classindex:3.11' compileOnly files("${projectDir}/../lib/Spigot-1.15.jar") compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar") diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index 694d19b9..74a957db 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -24,6 +24,7 @@ import de.steamwar.bausystem.Permission; import de.steamwar.bausystem.features.tracer.gui.TraceGui; import de.steamwar.bausystem.features.tracer.gui.TraceShowGui; import de.steamwar.bausystem.features.tracer.record.RecordStateMachine; +import de.steamwar.bausystem.features.tracer.show.Record; import de.steamwar.bausystem.features.tracer.show.*; import de.steamwar.bausystem.features.tracer.show.mode.BlockShowMode; import de.steamwar.bausystem.features.tracer.show.mode.ParticleShowMode; @@ -153,29 +154,29 @@ public class TraceCommand extends SWCommand { @Register("record") public void recordList(Player player, int recordID, int page) { if (!permissionCheck(player)) return; - Record record = StoredRecords.get(recordID); - if (record == null) { + Record traceRecord = StoredRecords.get(recordID); + if (traceRecord == null) { BauSystem.MESSAGE.send("TRACE_RECORD_NOT_FOUND", player); return; } - ListChatView.chatView(player, record.getTnt(), page, tntRecord -> { + ListChatView.chatView(player, traceRecord.getTnt(), page, tntRecord -> { TextComponent component = new TextComponent(); component.setText(BauSystem.MESSAGE.parse("TRACE_RECORD_ELEMENT", player, tntRecord.getPositions().size())); - component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + record.getId() + " tnt " + tntRecord.getId())); + component.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + traceRecord.getId() + " tnt " + tntRecord.getId())); component.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse("TRACE_RECORD_ELEMENT_HOVER", player)))); TextComponent deleteComponent = new TextComponent(); deleteComponent.setText(BauSystem.MESSAGE.parse("TRACE_RECORD_ELEMENT_DELETE", player)); - deleteComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record tnt delete " + record.getId() + " " + tntRecord.getId())); + deleteComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record tnt delete " + traceRecord.getId() + " " + tntRecord.getId())); deleteComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(BauSystem.MESSAGE.parse("TRACE_RECORD_ELEMENT_DELETE_HOVER", player)))); component.addExtra(deleteComponent); return component; }, (beforePageComponent, beforePage) -> { beforePageComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(BauSystem.MESSAGE.parse("LIST_PREVIOUS_PAGE", player)).create())); - beforePageComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + record.getId() + " " + beforePage)); + beforePageComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + traceRecord.getId() + " " + beforePage)); }, (afterPageComponent, afterPage) -> { afterPageComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(BauSystem.MESSAGE.parse("LIST_NEXT_PAGE", player)).create())); - afterPageComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + record.getId() + " " + afterPage)); + afterPageComponent.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/trace record " + traceRecord.getId() + " " + afterPage)); }); } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4aa4325c..0f5795e5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Sat Apr 10 23:34:12 CEST 2021 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists