Skip to content

Commit a4cfe49

Browse files
authored
General improvements to GT Module Code (#2736)
1 parent 5178d5c commit a4cfe49

File tree

3 files changed

+151
-68
lines changed

3 files changed

+151
-68
lines changed

src/main/java/gregtech/api/modules/IGregTechModule.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,33 @@ public interface IGregTechModule {
2121
/**
2222
* What other modules this module depends on.
2323
* <p>
24-
* e.g. <code>new ResourceLocation("gregtech", "foo_module")</code> represents a dependency on the module
24+
* e.g. {@code new ResourceLocation("gregtech", "foo_module")} represents a dependency on the module
2525
* "foo_module" in the container "gregtech"
2626
*/
2727
@NotNull
2828
default Set<ResourceLocation> getDependencyUids() {
2929
return Collections.emptySet();
3030
}
3131

32-
default void construction(FMLConstructionEvent event) {}
32+
default void construction(@NotNull FMLConstructionEvent event) {}
3333

34-
default void preInit(FMLPreInitializationEvent event) {}
34+
default void preInit(@NotNull FMLPreInitializationEvent event) {}
3535

36-
default void init(FMLInitializationEvent event) {}
36+
default void init(@NotNull FMLInitializationEvent event) {}
3737

38-
default void postInit(FMLPostInitializationEvent event) {}
38+
default void postInit(@NotNull FMLPostInitializationEvent event) {}
3939

40-
default void loadComplete(FMLLoadCompleteEvent event) {}
40+
default void loadComplete(@NotNull FMLLoadCompleteEvent event) {}
4141

42-
default void serverAboutToStart(FMLServerAboutToStartEvent event) {}
42+
default void serverAboutToStart(@NotNull FMLServerAboutToStartEvent event) {}
4343

44-
default void serverStarting(FMLServerStartingEvent event) {}
44+
default void serverStarting(@NotNull FMLServerStartingEvent event) {}
4545

46-
default void serverStarted(FMLServerStartedEvent event) {}
46+
default void serverStarted(@NotNull FMLServerStartedEvent event) {}
4747

48-
default void serverStopping(FMLServerStoppingEvent event) {}
48+
default void serverStopping(@NotNull FMLServerStoppingEvent event) {}
4949

50-
default void serverStopped(FMLServerStoppedEvent event) {}
50+
default void serverStopped(@NotNull FMLServerStoppedEvent event) {}
5151

5252
/**
5353
* Register packets using GregTech's packet handling API here.
@@ -87,7 +87,11 @@ default void registerPackets() {}
8787
return Collections.emptyList();
8888
}
8989

90-
default boolean processIMC(FMLInterModComms.IMCMessage message) {
90+
/**
91+
* @param message the message to process
92+
* @return if the message was processed, stopping all other modules from processing it
93+
*/
94+
default boolean processIMC(@NotNull FMLInterModComms.IMCMessage message) {
9195
return false;
9296
}
9397

src/main/java/gregtech/api/modules/IModuleManager.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,28 @@
44

55
import net.minecraft.util.ResourceLocation;
66

7+
import org.jetbrains.annotations.NotNull;
8+
import org.jetbrains.annotations.Nullable;
9+
710
public interface IModuleManager {
811

9-
default boolean isModuleEnabled(String containerID, String moduleID) {
12+
default boolean isModuleEnabled(@NotNull String containerID, @NotNull String moduleID) {
1013
return isModuleEnabled(new ResourceLocation(containerID, moduleID));
1114
}
1215

13-
default boolean isModuleEnabled(String moduleID) {
16+
default boolean isModuleEnabled(@NotNull String moduleID) {
1417
return isModuleEnabled(GTUtility.gregtechId(moduleID));
1518
}
1619

17-
boolean isModuleEnabled(ResourceLocation id);
20+
boolean isModuleEnabled(@NotNull ResourceLocation id);
1821

19-
void registerContainer(IModuleContainer container);
22+
void registerContainer(@NotNull IModuleContainer container);
2023

24+
@Nullable
2125
IModuleContainer getLoadedContainer();
2226

27+
@NotNull
2328
ModuleStage getStage();
2429

25-
boolean hasPassedStage(ModuleStage stage);
30+
boolean hasPassedStage(@NotNull ModuleStage stage);
2631
}

0 commit comments

Comments
 (0)