diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-06-02 18:46:40 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-06-02 18:46:40 +0800 |
| commit | 572ebd36c32c0248f2c826cc518eeedbc0701287 (patch) | |
| tree | e50b4c1fbc502bdca3494fe58f77c31adb3dd67c /api | |
| parent | fd4026dd30a2f8ba4c261f344a16b3adee9823a4 (diff) | |
| download | RoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.tar.gz RoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.tar.bz2 RoughlyEnoughItems-572ebd36c32c0248f2c826cc518eeedbc0701287.zip | |
Reformat code
Diffstat (limited to 'api')
6 files changed, 12 insertions, 13 deletions
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java index 4663aa832..4a641fed6 100644 --- a/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java +++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/drag/DraggableStackProvider.java @@ -43,7 +43,7 @@ public interface DraggableStackProvider<T extends Screen> extends Comparable<Dra } return false; } - + @Override @Nullable public DraggableStack getHoveredStack(DraggingContext<T> context, double mouseX, double mouseY) { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java index df0009462..d54323b7a 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java @@ -33,10 +33,10 @@ import net.minecraft.nbt.CompoundTag; /** * The registry for display serializers used for display serialization, useful for persistent displays across reloads, * and server-client communication. - * + * * <p>This is mostly a fallback system for {@link me.shedaniel.rei.api.common.transfer.info.MenuInfo#save(MenuSerializationContext, Display)}. - * - * @see REIPlugin#registerDisplaySerializer(DisplaySerializerRegistry) + * + * @see REIPlugin#registerDisplaySerializer(DisplaySerializerRegistry) */ public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> { static DisplaySerializerRegistry getInstance() { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java index c376a2b88..a5928679c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/entry/type/EntryTypeRegistry.java @@ -35,16 +35,16 @@ import java.util.Set; * Registry for registering alternative entry types. * * <p>{@link EntryType} must be declared statically, deferring to the actual - * definition by the identifier of the type. During reload, plugins should + * definition by the identifier of the type. During reload, plugins should * register {@link EntryDefinition} for their deferred {@link EntryType}, * these definitions are dynamic. - * + * * <p>{@link EntryTypeBridge} may be used to convert and compare between * different types - * + * * @see EntryDefinition - * @see #registerBridge(EntryType, EntryType, EntryTypeBridge) - * @see REIPlugin#registerEntryTypes(EntryTypeRegistry) + * @see #registerBridge(EntryType, EntryType, EntryTypeBridge) + * @see REIPlugin#registerEntryTypes(EntryTypeRegistry) */ public interface EntryTypeRegistry extends Reloadable<REIPlugin<?>> { static EntryTypeRegistry getInstance() { diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java index bf7927c2e..e9f87d51f 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfo.java @@ -121,7 +121,7 @@ public interface MenuInfo<T extends AbstractContainerMenu, D extends Display> ex default List<List<ItemStack>> getInputs(MenuInfoContext<T, ?, D> context) { if (context.getDisplay() == null) return Collections.emptyList(); return CollectionUtils.map(context.getDisplay().getInputEntries(), inputEntry -> - CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(inputEntry, + CollectionUtils.<EntryStack<?>, ItemStack>filterAndMap(inputEntry, stack -> stack.getType() == VanillaEntryTypes.ITEM, EntryStack::castValue)); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java index 44ca628b6..bd1b14ff6 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/transfer/info/MenuInfoRegistry.java @@ -45,8 +45,7 @@ public interface MenuInfoRegistry extends Reloadable<REIServerPlugin> { <D extends Display> void registerGeneric(Predicate<CategoryIdentifier<?>> categoryPredicate, MenuInfoProvider<?, D> menuInfo); - @Nullable - <C extends AbstractContainerMenu, D extends Display> MenuInfo<C, D> get(CategoryIdentifier<D> category, Class<C> menuClass); + @Nullable <C extends AbstractContainerMenu, D extends Display> MenuInfo<C, D> get(CategoryIdentifier<D> category, Class<C> menuClass); int infoSize(); } diff --git a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java index 8b421e151..827db488c 100644 --- a/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java +++ b/api/src/main/java/me/shedaniel/rei/api/common/util/EntryStacks.java @@ -80,7 +80,7 @@ public final class EntryStacks { EntryType<A> leftType = left.getType(); EntryType<B> rightType = right.getType(); if (leftType == rightType) { - return left.getDefinition().equals(left.getValue(), right.<A>castValue(), context); + return left.getDefinition().equals(left.getValue(), right.castValue(), context); } for (EntryTypeBridge<A, B> bridge : EntryTypeRegistry.getInstance().getBridgesFor(leftType, rightType)) { CompoundEventResult<Stream<EntryStack<B>>> holder = bridge.bridge(left); |
