Skip to content

Commit d9b2c1c

Browse files
ApexModderApexModder
authored
[21.11] Merge Development Changes (#13)
1 parent 7c95820 commit d9b2c1c

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("apex-conventions.neoforge") version "0.1.82"
3-
id("apex-conventions.maven-publishing") version "0.1.82"
2+
id("apex-conventions.neoforge") version "0.1.85"
3+
id("apex-conventions.maven-publishing") version "0.1.85"
44
}
55

66
group = "dev.apexstudios"

‎src/main/java/dev/apexstudios/registree/api/Registree.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -704,15 +704,15 @@ default <TMenu extends AbstractContainerMenu> DeferredMenu<TMenu> registerMenu(S
704704
///
705705
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
706706
/// @see #registerMenu(String, MenuType.MenuSupplier, FeatureFlag)
707-
<TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlagSet requiredFeatures);
707+
<TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlagSet requiredFeatures);
708708

709709
/// Enqueues a new {@link MenuType} registration for the given registry name
710710
///
711711
/// Additionally enqueues registration for the given screen factory
712712
///
713713
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
714714
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
715-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
715+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
716716
return registerMenu(registryName, factory, screenFactory, FeatureFlagSet.of(requiredFeature, requiredFeatures));
717717
}
718718

@@ -722,7 +722,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
722722
///
723723
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
724724
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
725-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature) {
725+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature) {
726726
return registerMenu(registryName, factory, screenFactory, FeatureFlagSet.of(requiredFeature));
727727
}
728728

@@ -732,7 +732,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
732732
///
733733
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
734734
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
735-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory) {
735+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory) {
736736
return registerMenu(registryName, factory, screenFactory, FeatureFlags.VANILLA_SET);
737737
}
738738

@@ -742,7 +742,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
742742
///
743743
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
744744
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
745-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlagSet requiredFeatures) {
745+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlagSet requiredFeatures) {
746746
return registerMenu(registryName, (MenuType.MenuSupplier<TMenu>) factory, screenFactory, requiredFeatures);
747747
}
748748

@@ -752,7 +752,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
752752
///
753753
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
754754
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
755-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
755+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
756756
return registerMenu(registryName, factory, screenFactory, FeatureFlagSet.of(requiredFeature, requiredFeatures));
757757
}
758758

@@ -762,7 +762,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
762762
///
763763
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
764764
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
765-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature) {
765+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature) {
766766
return registerMenu(registryName, factory, screenFactory, FeatureFlagSet.of(requiredFeature));
767767
}
768768

@@ -772,7 +772,7 @@ default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAcces
772772
///
773773
/// @return The {@link DeferredMenu} holding the enqueued {@link MenuType} registration
774774
/// @see #registerMenu(String, MenuType.MenuSupplier, Supplier, FeatureFlagSet)
775-
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory) {
775+
default <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory) {
776776
return registerMenu(registryName, factory, screenFactory, FeatureFlags.VANILLA_SET);
777777
}
778778
// endregion

‎src/main/java/dev/apexstudios/registree/impl/SimpleRegistree.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ public final <TRegistry> ResourceKey<TRegistry> register(ResourceKey<? extends R
184184
}
185185

186186
@Override
187-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlagSet requiredFeatures) {
187+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlagSet requiredFeatures) {
188188
var holder = registerMenu(registryName, factory, requiredFeatures);
189-
withEventBus(modBus -> modBus.addListener(EventPriority.LOW, RegisterMenuScreensEvent.class, event -> event.register(holder.value(), screenFactory.get())));
189+
withEventBus(modBus -> modBus.addListener(EventPriority.LOW, RegisterMenuScreensEvent.class, event -> event.register(holder.value(), screenFactory.get().get())));
190190
return holder;
191191
}
192192

@@ -532,37 +532,37 @@ public final <TMenu extends AbstractContainerMenu> DeferredMenu<TMenu> registerM
532532
}
533533

534534
@Override
535-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
535+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
536536
return Registree.super.registerMenu(registryName, factory, screenFactory, requiredFeature, requiredFeatures);
537537
}
538538

539539
@Override
540-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature) {
540+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature) {
541541
return Registree.super.registerMenu(registryName, factory, screenFactory, requiredFeature);
542542
}
543543

544544
@Override
545-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory) {
545+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, MenuType.MenuSupplier<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory) {
546546
return Registree.super.registerMenu(registryName, factory, screenFactory);
547547
}
548548

549549
@Override
550-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlagSet requiredFeatures) {
550+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlagSet requiredFeatures) {
551551
return Registree.super.registerMenu(registryName, factory, screenFactory, requiredFeatures);
552552
}
553553

554554
@Override
555-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
555+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature, FeatureFlag... requiredFeatures) {
556556
return Registree.super.registerMenu(registryName, factory, screenFactory, requiredFeature, requiredFeatures);
557557
}
558558

559559
@Override
560-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory, FeatureFlag requiredFeature) {
560+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory, FeatureFlag requiredFeature) {
561561
return Registree.super.registerMenu(registryName, factory, screenFactory, requiredFeature);
562562
}
563563

564564
@Override
565-
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>> screenFactory) {
565+
public final <TMenu extends AbstractContainerMenu, TScreen extends Screen & MenuAccess<TMenu>> DeferredMenu<TMenu> registerMenu(String registryName, IContainerFactory<TMenu> factory, Supplier<Supplier<MenuScreens.ScreenConstructor<TMenu, TScreen>>> screenFactory) {
566566
return Registree.super.registerMenu(registryName, factory, screenFactory);
567567
}
568568

0 commit comments

Comments
 (0)