Skip to content
This repository was archived by the owner on Jul 18, 2023. It is now read-only.

Commit

Permalink
fix: gas registry name
Browse files Browse the repository at this point in the history
how did i not notice this
  • Loading branch information
marcus8448 committed Jul 22, 2021
1 parent 81a53c8 commit 0c622d3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
34 changes: 17 additions & 17 deletions src/main/java/dev/galacticraft/api/registry/AddonRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class AddonRegistry {
* <i>THIS REGISTRY WILL NOT CONTAIN ENTRIES OBTAINED VIA DATAPACK</i>.
*/
public static final RegistryKey<Registry<Gas>> GAS_KEY = RegistryKey.ofRegistry(new Identifier(Constant.MOD_ID, "gas"));
public static final MutableRegistry<Gas> _GAS = FabricRegistryBuilder.from(
public static final MutableRegistry<Gas> GAS = FabricRegistryBuilder.from(
new DefaultedRegistry<>(new Identifier(Constant.MOD_ID, "oxygen").toString(),
GAS_KEY, Lifecycle.experimental())).buildAndRegister();

Expand Down Expand Up @@ -99,22 +99,22 @@ public class AddonRegistry {
ROCKET_PART_KEY, Lifecycle.experimental())).buildAndRegister();

static {
Registry.register(_GAS, Gas.HYDROGEN_ID, Gas.HYDROGEN);
Registry.register(_GAS, Gas.NITROGEN_ID, Gas.NITROGEN);
Registry.register(_GAS, Gas.OXYGEN_ID, Gas.OXYGEN);
Registry.register(_GAS, Gas.CARBON_DIOXIDE_ID, Gas.CARBON_DIOXIDE);
Registry.register(_GAS, Gas.WATER_VAPOR_ID, Gas.WATER_VAPOR);
Registry.register(_GAS, Gas.METHANE_ID, Gas.METHANE);
Registry.register(_GAS, Gas.HELIUM_ID, Gas.HELIUM);
Registry.register(_GAS, Gas.ARGON_ID, Gas.ARGON);
Registry.register(_GAS, Gas.NEON_ID, Gas.NEON);
Registry.register(_GAS, Gas.KRYPTON_ID, Gas.KRYPTON);
Registry.register(_GAS, Gas.NITROUS_OXIDE_ID, Gas.NITROUS_OXIDE);
Registry.register(_GAS, Gas.CARBON_MONOXIDE_ID, Gas.CARBON_MONOXIDE);
Registry.register(_GAS, Gas.XENON_ID, Gas.XENON);
Registry.register(_GAS, Gas.OZONE_ID, Gas.OZONE);
Registry.register(_GAS, Gas.NITROUS_DIOXIDE_ID, Gas.NITROUS_DIOXIDE);
Registry.register(_GAS, Gas.IODINE_ID, Gas.IODINE);
Registry.register(GAS, Gas.HYDROGEN_ID, Gas.HYDROGEN);
Registry.register(GAS, Gas.NITROGEN_ID, Gas.NITROGEN);
Registry.register(GAS, Gas.OXYGEN_ID, Gas.OXYGEN);
Registry.register(GAS, Gas.CARBON_DIOXIDE_ID, Gas.CARBON_DIOXIDE);
Registry.register(GAS, Gas.WATER_VAPOR_ID, Gas.WATER_VAPOR);
Registry.register(GAS, Gas.METHANE_ID, Gas.METHANE);
Registry.register(GAS, Gas.HELIUM_ID, Gas.HELIUM);
Registry.register(GAS, Gas.ARGON_ID, Gas.ARGON);
Registry.register(GAS, Gas.NEON_ID, Gas.NEON);
Registry.register(GAS, Gas.KRYPTON_ID, Gas.KRYPTON);
Registry.register(GAS, Gas.NITROUS_OXIDE_ID, Gas.NITROUS_OXIDE);
Registry.register(GAS, Gas.CARBON_MONOXIDE_ID, Gas.CARBON_MONOXIDE);
Registry.register(GAS, Gas.XENON_ID, Gas.XENON);
Registry.register(GAS, Gas.OZONE_ID, Gas.OZONE);
Registry.register(GAS, Gas.NITROUS_DIOXIDE_ID, Gas.NITROUS_DIOXIDE);
Registry.register(GAS, Gas.IODINE_ID, Gas.IODINE);

Registry.register(TRAVEL_PREDICATE, new Identifier(Constant.MOD_ID, "access_weight"), AccessWeightPredicateType.INSTANCE);
Registry.register(TRAVEL_PREDICATE, new Identifier(Constant.MOD_ID, "constant"), ConstantTravelPredicateType.INSTANCE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private static <T, R extends MutableRegistry<T>> R addRegistry(RegistryKey<? ext
@Inject(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/registry/BuiltinRegistries;addRegistry(Lnet/minecraft/util/registry/RegistryKey;Ljava/util/function/Supplier;)Lnet/minecraft/util/registry/Registry;", ordinal = 0))
private static void addGCRegistries(CallbackInfo ci) {
BuiltinObjects.register();
addRegistry(AddonRegistry.GAS_KEY, AddonRegistry._GAS, () -> Gas.OXYGEN, Lifecycle.experimental());
addRegistry(AddonRegistry.GAS_KEY, AddonRegistry.GAS, () -> Gas.OXYGEN, Lifecycle.experimental());
addRegistry(AddonRegistry.GALAXY_KEY, AddonRegistry.GALAXY, () -> BuiltinObjects.MILKY_WAY, Lifecycle.experimental());
addRegistry(AddonRegistry.CELESTIAL_BODY_KEY, AddonRegistry.CELESTIAL_BODY, () -> BuiltinObjects.SOL, Lifecycle.experimental());
addRegistry(AddonRegistry.ROCKET_PART_KEY, AddonRegistry.ROCKET_PART, () -> RocketPart.INVALID, Lifecycle.experimental());
Expand Down

0 comments on commit 0c622d3

Please sign in to comment.