Skip to content

Commit a9b2770

Browse files
gabizougabizou
committed
feat: update to event-impl-gen 8 release
1 parent 1eb047c commit a9b2770

24 files changed

+182
-28
lines changed

‎.checkstyle/checkstyle-suppressions.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717
<suppress checks="MethodTypeParameterName"/>
1818
<suppress checks="CommentsIndentation"/>
1919
<suppress checks="InterfaceTypeParameterName"/>
20+
<suppress files="[\\/]generated[\\/]" checks="[a-zA-Z0-9]*"/>
2021
</suppressions>

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependency-reduced-pom.xml
66
!.checkstyle/
77
# We exclude the generated events from git to avoid
88
# temptation to edit said generated files.
9+
src/generated/
910
src/main/generated/
1011

1112
# Compiled #

‎build.gradle.kts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import net.ltgt.gradle.errorprone.errorprone
22
import org.jetbrains.gradle.ext.delegateActions
33
import org.jetbrains.gradle.ext.settings
4-
import org.jetbrains.gradle.ext.taskTriggers
54

65

76
plugins {
@@ -44,7 +43,9 @@ tasks {
4443

4544
sourceSets {
4645
main {
47-
java.srcDirs(generatedEventSourcesDir)
46+
java {
47+
srcDirs(generatedEventSourcesDir)
48+
}
4849
}
4950
}
5051

@@ -145,6 +146,13 @@ dependencies {
145146
testImplementation(libs.mockito)
146147
}
147148

149+
spotless {
150+
java {
151+
target("src/main/java/**/*.java")
152+
targetExclude("src/main/generated/**/*.java")
153+
}
154+
}
155+
148156
tasks {
149157

150158
compileJava {
@@ -170,6 +178,15 @@ tasks {
170178
indraGit.applyVcsInformationToManifest(this)
171179
}
172180
}
181+
checkstyleMain {
182+
dependsOn(compileJava)
183+
}
184+
spotlessJava {
185+
dependsOn(compileJava)
186+
}
187+
sourcesJar {
188+
dependsOn(compileJava)
189+
}
173190

174191
withType(JavaCompile::class).configureEach {
175192
options.apply {

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ guice = { module = "com.google.inject:guice", version.ref = "guice" }
3737
log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
3838
math = { module = "org.spongepowered:math", version.ref = "math" }
3939
pluginSpi = { module = "org.spongepowered:plugin-spi", version.ref = "pluginSpi" }
40-
eventImplGen-processor = {module = "org.spongepowered:event-impl-gen", version = "8.0.0-SNAPSHOT"}
41-
eventImplGen-annotations = { module = "org.spongepowered:event-impl-gen-annotations", version = "8.0.0-SNAPSHOT"}
40+
eventImplGen-processor = {module = "org.spongepowered:event-impl-gen", version = "8.0.0"}
41+
eventImplGen-annotations = { module = "org.spongepowered:event-impl-gen-annotations", version = "8.0.0"}
4242

4343
# build-time/annotations
4444

‎gradle/verification-metadata.xml‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
<configuration>
44
<verify-metadata>true</verify-metadata>
55
<verify-signatures>false</verify-signatures>
6-
<trusted-artifacts>
7-
<trust group="org.spongepowered" name="event-impl-gen" reason="SNAPSHOT"/>
8-
<trust group="org.spongepowered" name="event-impl-gen-annotations" reason="SNAPSHOT"/>
9-
</trusted-artifacts>
106
</configuration>
117
<components>
128
<component group="aopalliance" name="aopalliance" version="1.0">
@@ -272,6 +268,14 @@
272268
<sha256 value="5cb60843f46bbccf97bd832d5490d26ab192af2e663fad7e5971969bf20fb94e" origin="Generated by Gradle"/>
273269
</artifact>
274270
</component>
271+
<component group="com.google.dagger" name="dagger" version="2.54">
272+
<artifact name="dagger-2.54.jar">
273+
<sha256 value="7ab0d8278a532888de19025dc6ee70a80ecd4567778a6a7e7ec256a2073e40a3" origin="Generated by Gradle"/>
274+
</artifact>
275+
<artifact name="dagger-2.54.pom">
276+
<sha256 value="af43413fd91fc49532884ca32191ab31bec609c344d4939aece9d3efef699f81" origin="Generated by Gradle"/>
277+
</artifact>
278+
</component>
275279
<component group="com.google.errorprone" name="error_prone_annotation" version="2.24.1">
276280
<artifact name="error_prone_annotation-2.24.1.jar">
277281
<sha256 value="dc202da451680aa8cdda7c68d959f27c112dca8f8fdeaf7c597de73cb2b1a0a6" origin="Generated by Gradle"/>
@@ -569,6 +573,14 @@
569573
<sha256 value="9acf56a8579c05bedd819d99232363e2bf327e8f73c67598dbd9885a845a3c69" origin="Generated by Gradle"/>
570574
</artifact>
571575
</component>
576+
<component group="com.palantir.javapoet" name="javapoet" version="0.6.0">
577+
<artifact name="javapoet-0.6.0.jar">
578+
<sha256 value="1c8dd1cc4404b9eeb5c54fef8a1cf2be7a138a42783b9460fbae9caf85ed5b2f" origin="Generated by Gradle"/>
579+
</artifact>
580+
<artifact name="javapoet-0.6.0.pom">
581+
<sha256 value="f6e34a26ac09a3a68a91cc9235cb1f8c7736b07fe89db59a324acd8d57d9e797" origin="Generated by Gradle"/>
582+
</artifact>
583+
</component>
572584
<component group="com.puppycrawl.tools" name="checkstyle" version="10.12.7">
573585
<artifact name="checkstyle-10.12.7.jar">
574586
<sha256 value="767cc2393169f0abe4292e59c3b62317149f900a472cd6b01f74346f6bdae581" origin="Generated by Gradle"/>
@@ -1552,6 +1564,9 @@
15521564
<artifact name="checker-qual-3.19.0.module">
15531565
<sha256 value="53e1899dde3c513ca1efd376abffac0e6907e8e84abd5f966242634c95e4d157" origin="Generated by Gradle"/>
15541566
</artifact>
1567+
<artifact name="checker-qual-3.19.0.pom">
1568+
<sha256 value="29ba9c5ce1a94b700bd823c4ed612f5827b590f19a49775fd7eb8f997f8aa371" origin="Generated by Gradle"/>
1569+
</artifact>
15551570
</component>
15561571
<component group="org.checkerframework" name="checker-qual" version="3.33.0">
15571572
<artifact name="checker-qual-3.33.0.jar">
@@ -1810,6 +1825,14 @@
18101825
<sha256 value="33b8c22f2424c2903241a7fea258fc41ab0c4d6889776576c519047562ee43a5" origin="Generated by Gradle"/>
18111826
</artifact>
18121827
</component>
1828+
<component group="org.jspecify" name="jspecify" version="1.0.0">
1829+
<artifact name="jspecify-1.0.0.jar">
1830+
<sha256 value="1fad6e6be7557781e4d33729d49ae1cdc8fdda6fe477bb0cc68ce351eafdfbab" origin="Generated by Gradle"/>
1831+
</artifact>
1832+
<artifact name="jspecify-1.0.0.module">
1833+
<sha256 value="d307ca77a54e18ac1ef1aaed4e5bbe014bd2f49f29e1d2f813e47c278283195b" origin="Generated by Gradle"/>
1834+
</artifact>
1835+
</component>
18131836
<component group="org.junit" name="junit-bom" version="5.10.0">
18141837
<artifact name="junit-bom-5.10.0.module">
18151838
<sha256 value="eb3ee6127608010694a898056e7407d117296003aba5f5db801df430b9887fcf" origin="Generated by Gradle"/>
@@ -2134,6 +2157,25 @@
21342157
<sha256 value="b68149d290f328b6b54d0f7f7d304adab5148cedd6ae18dc3baae8bf9f1757c6" origin="Generated by Gradle"/>
21352158
</artifact>
21362159
</component>
2160+
<component group="org.spongepowered" name="event-impl-gen" version="8.0.0">
2161+
<artifact name="event-impl-gen-8.0.0.jar">
2162+
<sha256 value="6e26ff9a8d9f5a9fe39fe3e64781061bf068405c04095d78c044719ac2918992" origin="Generated by Gradle"/>
2163+
</artifact>
2164+
<artifact name="event-impl-gen-8.0.0.module">
2165+
<sha256 value="5b919469a6bead6b6107212e4bf441c7576fc52f0b590db4bc13f742ebbfd983" origin="Generated by Gradle"/>
2166+
</artifact>
2167+
</component>
2168+
<component group="org.spongepowered" name="event-impl-gen-annotations" version="8.0.0">
2169+
<artifact name="event-impl-gen-annotations-8.0.0-javadoc.jar">
2170+
<sha256 value="6f4b8d62436da73bedb9baf543180f5068e99b77d38f15fbd463d4df7251d4d9" origin="Generated by Gradle"/>
2171+
</artifact>
2172+
<artifact name="event-impl-gen-annotations-8.0.0.jar">
2173+
<sha256 value="278e01efedb92a95be74714ea2bec08d29326b4893f6e957aa3bd39a15840776" origin="Generated by Gradle"/>
2174+
</artifact>
2175+
<artifact name="event-impl-gen-annotations-8.0.0.module">
2176+
<sha256 value="b0fddddd441038c0889450e8c0ebac970f0d606b246db99fd59c23c73e7ba534" origin="Generated by Gradle"/>
2177+
</artifact>
2178+
</component>
21372179
<component group="org.spongepowered" name="math" version="2.0.1">
21382180
<artifact name="math-2.0.1-javadoc.jar">
21392181
<sha256 value="eef4d1e6421cd975ebdb7ae6be8632c0e89c0e8b671ee0fb542d8e6ddad2df12" origin="Generated by Gradle"/>

‎src/main/java/org/spongepowered/api/data/DataManipulator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.spongepowered.api.data.value.Value;
3131
import org.spongepowered.api.data.value.ValueContainer;
3232
import org.spongepowered.api.entity.Entity;
33-
import org.spongepowered.eventgen.annotations.TransformWith;
3433
import org.spongepowered.api.world.World;
34+
import org.spongepowered.eventgen.annotations.TransformWith;
3535

3636
import java.util.Arrays;
3737
import java.util.Objects;

‎src/main/java/org/spongepowered/api/event/CompositeEvent.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
/*
2+
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
125
package org.spongepowered.api.event;
226

327
import org.spongepowered.api.event.impl.AbstractCompositeEvent;

‎src/main/java/org/spongepowered/api/event/action/CollideEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.spongepowered.api.entity.Entity;
2929
import org.spongepowered.api.event.Cancellable;
3030
import org.spongepowered.api.event.Event;
31-
import org.spongepowered.eventgen.annotations.NoFactoryMethod;
3231
import org.spongepowered.api.world.server.ServerLocation;
32+
import org.spongepowered.eventgen.annotations.NoFactoryMethod;
3333

3434
/**
3535
* Fired when an {@link Entity} or {@link BlockSnapshot} collide with each other.

‎src/main/java/org/spongepowered/api/event/block/InteractBlockEvent.java‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import org.spongepowered.api.item.inventory.ItemStack;
3636
import org.spongepowered.api.util.Direction;
3737
import org.spongepowered.api.util.Tristate;
38+
import org.spongepowered.api.world.server.ServerLocation;
3839
import org.spongepowered.eventgen.annotations.GenerateFactoryMethod;
3940
import org.spongepowered.eventgen.annotations.ImplementedBy;
40-
import org.spongepowered.api.world.server.ServerLocation;
4141
import org.spongepowered.math.vector.Vector3d;
4242

4343
/**
@@ -193,6 +193,40 @@ interface Pre extends Secondary, Cancellable {
193193
@ImplementedBy(AbstractCompositeEvent.class)
194194
interface Post extends Secondary, CompositeEvent<Secondary> {
195195

196+
@Override
197+
default Tristate originalUseItemResult() {
198+
return this.baseEvent().originalUseItemResult();
199+
}
200+
201+
@Override
202+
default Tristate originalUseBlockResult() {
203+
return this.baseEvent().originalUseBlockResult();
204+
}
205+
206+
@Override
207+
default Tristate useItemResult() {
208+
return this.baseEvent().useItemResult();
209+
}
210+
211+
@Override
212+
default Tristate useBlockResult() {
213+
return this.baseEvent().useBlockResult();
214+
}
215+
216+
@Override
217+
default Vector3d interactionPoint() {
218+
return this.baseEvent().interactionPoint();
219+
}
220+
221+
@Override
222+
default BlockSnapshot block() {
223+
return this.baseEvent().block();
224+
}
225+
226+
@Override
227+
default Direction targetSide() {
228+
return this.baseEvent().targetSide();
229+
}
196230
}
197231

198232
}

‎src/main/java/org/spongepowered/api/event/block/ScheduleBlockUpdateEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Fired when a {@link ScheduledUpdate scheduled block update}
3838
* is being proposed to the engine.
3939
*/
40-
public interface ScheduleBlockUpdateEvent<T extends Object> extends GenericEvent<T>, Cancellable {
40+
public interface ScheduleBlockUpdateEvent<T> extends GenericEvent<T>, Cancellable {
4141

4242
/**
4343
* Gets a list of the {@link ScheduleUpdateTicket}s for this event.

0 commit comments

Comments
 (0)