Skip to content

Commit 65b9a03

Browse files
committed
refactor(api): make register return boolean value
1 parent 617009f commit 65b9a03

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

src/main/java/micdoodle8/mods/galacticraft/api/galaxies/GalaxyRegistry.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,15 @@ public static CelestialBody getCelestialBodyFromUnlocalizedName(String unlocaliz
192192
return getPlanetOrMoonFromTranslationkey(unlocalizedName);
193193
}
194194

195-
public static <T> void register(T object)
195+
public static <T> boolean register(T object)
196196
{
197197
if (object instanceof SolarSystem)
198198
{
199199
SolarSystem solarSystem = (SolarSystem) object;
200200
RegisterEvent registerEvent = new RegisterEvent(solarSystem, Loader.instance().activeModContainer());
201201
solarSystems.add(solarSystem);
202202
objects.add(solarSystem);
203-
MinecraftForge.EVENT_BUS.post(registerEvent);
203+
return MinecraftForge.EVENT_BUS.post(registerEvent);
204204
}
205205

206206
if (object instanceof Planet)
@@ -209,7 +209,7 @@ public static <T> void register(T object)
209209
RegisterEvent registerEvent = new RegisterEvent(planet, Loader.instance().activeModContainer());
210210
planets.add(planet);
211211
objects.add(planet);
212-
MinecraftForge.EVENT_BUS.post(registerEvent);
212+
return MinecraftForge.EVENT_BUS.post(registerEvent);
213213
}
214214

215215
if (object instanceof Moon)
@@ -218,7 +218,7 @@ public static <T> void register(T object)
218218
RegisterEvent registerEvent = new RegisterEvent(moon, Loader.instance().activeModContainer());
219219
moons.add(moon);
220220
objects.add(moon);
221-
MinecraftForge.EVENT_BUS.post(registerEvent);
221+
return MinecraftForge.EVENT_BUS.post(registerEvent);
222222
}
223223

224224
if (object instanceof Satellite)
@@ -227,7 +227,7 @@ public static <T> void register(T object)
227227
RegisterEvent registerEvent = new RegisterEvent(satellite, Loader.instance().activeModContainer());
228228
satellites.add(satellite);
229229
objects.add(satellite);
230-
MinecraftForge.EVENT_BUS.post(registerEvent);
230+
return MinecraftForge.EVENT_BUS.post(registerEvent);
231231
}
232232

233233
if (object instanceof CelestialBody)
@@ -242,7 +242,20 @@ public static <T> void register(T object)
242242

243243
RegisterEvent registerEvent = new RegisterEvent(celestialType, Loader.instance().activeModContainer());
244244
objects.add(celestialType);
245-
MinecraftForge.EVENT_BUS.post(registerEvent);
245+
return MinecraftForge.EVENT_BUS.post(registerEvent);
246+
}
247+
248+
throw new GalacticraftRegistryException("Unable to register " + object);
249+
}
250+
251+
public static class GalacticraftRegistryException extends RuntimeException
252+
{
253+
254+
private static final long serialVersionUID = -6874512550357215087L;
255+
256+
public GalacticraftRegistryException(String message)
257+
{
258+
super(message);
246259
}
247260
}
248261

0 commit comments

Comments
 (0)