Skip to content

Fix carpet extension display #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Fix carpet extension display #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7f6f5f
Fix compat api wrong return value
Hendrix-Shen Jan 4, 2025
4c48554
Migrating initialisation parameters to constructors
Hendrix-Shen Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...ib-legacy-compat/src/main/java/top/hendrixshen/magiclib/impl/carpet/CarpetEntrypoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ public static void init() {
.orElseThrow(RuntimeException::new)
},
SharedConstants.getMagiclibIdentifier(),
new MagicLibSettingManager(SharedConstants.getMagiclibIdentifier(),
SharedConstants.getMagiclibIdentifier(),
SharedConstants.getMagiclibName()),
new MagicLibSettingManager(),
ReflectionUtil.newInstance("top.hendrixshen.magiclib.impl.carpet.MagicLibAddition", null)
.orElseThrow(RuntimeException::new));
}
Expand Down
5 changes: 3 additions & 2 deletions ...acy-compat/src/main/java/top/hendrixshen/magiclib/impl/carpet/MagicLibSettingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package top.hendrixshen.magiclib.impl.carpet;

import top.hendrixshen.magiclib.SharedConstants;
import top.hendrixshen.magiclib.carpet.impl.WrappedSettingManager;

public class MagicLibSettingManager extends WrappedSettingManager {
public MagicLibSettingManager(String version, String identifier, String fancyName) {
super(version, identifier, fancyName);
public MagicLibSettingManager() {
super(SharedConstants.getMagiclibVersion(), SharedConstants.getMagiclibIdentifier(), SharedConstants.getMagiclibName());
}
}
6 changes: 2 additions & 4 deletions ...ib-minecraft-api/src/main/java/top/hendrixshen/magiclib/util/minecraft/ComponentUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,9 @@ public static MutableComponentCompat propertyCompat(Property<?> property, Object

public static @NotNull MutableComponentCompat joinCompat(
MutableComponentCompat joiner, @NotNull Iterable<MutableComponentCompat> items) {
MutableComponentCompat text = ComponentUtil.emptyCompat();
ComponentUtil.join(text.get(), StreamSupport.stream(items.spliterator(), false)
return MutableComponentCompat.of(ComponentUtil.join(joiner.get(), StreamSupport.stream(items.spliterator(), false)
.map(MutableComponentCompat::get)
.collect(Collectors.toList()));
return text;
.collect(Collectors.toList())));
}

public static @NotNull BaseComponent join(BaseComponent joiner, BaseComponent... items) {
Expand Down