Skip to content

Commit 4da2793

Browse files
committed
Resolve minor issues
1 parent 5eeff6c commit 4da2793

7 files changed

Lines changed: 14 additions & 17 deletions

File tree

src/main/java/de/geolykt/starloader/StarloaderAPIExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import de.geolykt.starloader.api.Galimulator;
66
import de.geolykt.starloader.api.event.EventManager;
7-
import de.geolykt.starloader.api.event.lifecycle.SignalExtensionTerminationExtension;
7+
import de.geolykt.starloader.api.event.lifecycle.SignalExtensionTerminationEvent;
88
import de.geolykt.starloader.api.gui.Drawing;
99
import de.geolykt.starloader.api.gui.modconf.ModConf;
1010
import de.geolykt.starloader.impl.DrawingManager;
@@ -30,7 +30,7 @@ public void preInitialize() {
3030

3131
@Override
3232
public void unload() {
33-
EventManager.handleEvent(new SignalExtensionTerminationExtension(this));
33+
EventManager.handleEvent(new SignalExtensionTerminationEvent(this));
3434
getLogger().info("SLAPI is going to bed. Let's conquer the stars tomorrow!");
3535
}
3636

src/main/java/de/geolykt/starloader/api/empire/Planet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.jetbrains.annotations.NotNull;
66

77
/**
8-
* @deprecated Planets are not stored in any meaningful matter as of know, obtaining them would be a pain.
8+
* @deprecated Planets are not stored in any meaningful matter as of now; obtaining them would be a pain.
99
* The full implementation of this interface will be delayed until the game changed in a way that this is possible.
1010
*
1111
* A planet that is part of a star system.
@@ -24,7 +24,7 @@ public interface Planet {
2424
/**
2525
* Obtains the name of the planet.
2626
* The game usually appends the ordinal (+1) of the planet to the name of the parent system
27-
* to obtain the name of the planet. TODO can this also result in other names?
27+
* to obtain the name of the planet.
2828
*
2929
* @return The name of the planet.
3030
*/

src/main/java/de/geolykt/starloader/api/event/lifecycle/SignalExtensionTerminationExtension.java renamed to src/main/java/de/geolykt/starloader/api/event/lifecycle/SignalExtensionTerminationEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* Due to how SLL Classloading works, the entirety of the SLAPI becomes unavailable after this event is
1212
* fired with a {@link StarloaderAPIExtension} as the targeted extension.
1313
*/
14-
public class SignalExtensionTerminationExtension extends Event {
14+
public class SignalExtensionTerminationEvent extends Event {
1515
protected final Extension unloadingExtension;
1616

17-
public SignalExtensionTerminationExtension(Extension unloadingExtension) {
17+
public SignalExtensionTerminationEvent(Extension unloadingExtension) {
1818
this.unloadingExtension = unloadingExtension;
1919
}
2020

src/main/java/de/geolykt/starloader/api/gui/InputDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.function.Consumer;
44

55
import org.jetbrains.annotations.NotNull;
6+
import org.jetbrains.annotations.Nullable;
67

78
public interface InputDialog extends Closable {
89

@@ -14,7 +15,7 @@ public interface InputDialog extends Closable {
1415
*
1516
* @param hook The Hook to attach
1617
*/
17-
public void addHook(@NotNull Consumer<String> hook);
18+
public void addHook(@NotNull Consumer<@Nullable String> hook);
1819

1920
/**
2021
* Closes the object from view. However unlike {@link #close()} this method does

src/main/java/de/geolykt/starloader/impl/StarloaderInputDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.function.Consumer;
44

55
import org.jetbrains.annotations.NotNull;
6+
import org.jetbrains.annotations.Nullable;
67

78
import de.geolykt.starloader.api.gui.InputDialog;
89

@@ -19,7 +20,7 @@ public StarloaderInputDialog(String title, TextInputWrapper wrapper, String text
1920
}
2021

2122
@Override
22-
public void addHook(@NotNull Consumer<String> hook) {
23+
public void addHook(@NotNull Consumer<@Nullable String> hook) {
2324
this.wrapper.addHook(hook);
2425
}
2526

src/main/java/de/geolykt/starloader/impl/actors/WrappedActor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.jetbrains.annotations.NotNull;
44
import org.jetbrains.annotations.Nullable;
55

6+
import de.geolykt.starloader.api.NullUtils;
67
import de.geolykt.starloader.api.actor.ActorSpec;
78
import de.geolykt.starloader.api.actor.wrapped.WrappingActor;
89
import de.geolykt.starloader.api.actor.wrapped.WrappingConfiguration;
@@ -44,10 +45,7 @@ public float getMaximumVelocity() {
4445
if (config.inheritName()) {
4546
return delegate.getName();
4647
}
47-
String name = super.getName();
48-
if (name == null) {
49-
throw new NullPointerException("The name was null!");
50-
}
48+
String name = NullUtils.requireNotNull(super.getName());
5149
return name;
5250
}
5351

src/main/java/de/geolykt/starloader/impl/actors/WrappedMissile.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.jetbrains.annotations.NotNull;
44
import org.jetbrains.annotations.Nullable;
55

6+
import de.geolykt.starloader.api.NullUtils;
67
import de.geolykt.starloader.api.actor.ActorSpec;
78
import de.geolykt.starloader.api.actor.spacecrafts.MissileSpec;
89
import de.geolykt.starloader.api.actor.wrapped.WrappingActor;
@@ -58,11 +59,7 @@ public float getMaximumVelocity() {
5859
if (config.inheritName()) {
5960
return delegate.getName();
6061
}
61-
String name = super.getName();
62-
if (name == null) {
63-
throw new NullPointerException("The name of the missile is somehow null!");
64-
}
65-
return name;
62+
return NullUtils.requireNotNull(super.getName());
6663
}
6764

6865
@Override

0 commit comments

Comments
 (0)