MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed namespace

Browse source
This commit is contained in:
Frank 2022-10-29 13:07:44 +02:00
parent 47756e7ebf
commit 01c59be6ae
62 changed files with 107 additions and 4332 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java
View file

@ -6,14 +6,15 @@ import org.betterx.bclib.config.Configs;
import org.betterx.bclib.config.NamedPathConfig;
import org.betterx.bclib.config.NamedPathConfig.ConfigTokenDescription;
import org.betterx.bclib.config.NamedPathConfig.DependendConfigToken;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.vanilla.LayoutScreenWithIcon;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import org.wunder.lib.ui.layout.components.*;
import org.wunder.lib.ui.vanilla.LayoutScreenWithIcon;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;

17
src/main/java/org/betterx/bclib/client/gui/modmenu/TestScreen.java
View file

@ -1,10 +1,6 @@
package org.betterx.bclib.client.gui.modmenu;
import org.betterx.bclib.BCLib;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.layout.values.Size;
import org.betterx.ui.vanilla.LayoutScreen;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
@ -12,6 +8,11 @@ import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.*;
import org.wunder.lib.ui.layout.values.Size;
import org.wunder.lib.ui.vanilla.LayoutScreen;
@Environment(EnvType.CLIENT)
public class TestScreen extends LayoutScreen {
public TestScreen(Component component) {
@ -77,17 +78,17 @@ public class TestScreen extends LayoutScreen {
VerticalScroll.create(page2)
));
rows.add(new Input(fitOrFill(), fit(), Component.literal("Input"), "0xff00ff"));
rows.add(new ColorSwatch(fit(), fit(), ColorUtil.LIGHT_PURPLE).centerHorizontal());
rows.add(new ColorSwatch(fit(), fit(), ColorHelper.LIGHT_PURPLE).centerHorizontal());
rows.add(new ColorPicker(
fill(),
fit(),
Component.literal("Color"),
ColorUtil.GREEN
ColorHelper.GREEN
).centerHorizontal());
rows.add(new Text(
fitOrFill(), fixed(20),
Component.literal("Some blue text")
).centerHorizontal().setColor(ColorUtil.BLUE)
).centerHorizontal().setColor(ColorHelper.BLUE)
);
rows.addHLine(fixed(32), fixed(16));
rows.add(c);
@ -110,7 +111,7 @@ public class TestScreen extends LayoutScreen {
fill(), fit(),
Component.literal(
"Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.")
).setColor(ColorUtil.LIGHT_PURPLE).centerHorizontal()
).setColor(ColorHelper.LIGHT_PURPLE).centerHorizontal()
);
rows.addHorizontalLine(16);

3
src/main/java/org/betterx/bclib/client/gui/screens/BCLibLayoutScreen.java
View file

@ -1,12 +1,13 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.bclib.BCLib;
import org.betterx.ui.vanilla.LayoutScreenWithIcon;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import org.wunder.lib.ui.vanilla.LayoutScreenWithIcon;
import org.jetbrains.annotations.Nullable;
public abstract class BCLibLayoutScreen extends LayoutScreenWithIcon {

10
src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java
View file

@ -1,11 +1,6 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.ui.layout.components.Checkbox;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
@ -13,6 +8,11 @@ import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.layout.components.Checkbox;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
import org.jetbrains.annotations.Nullable;
@Environment(EnvType.CLIENT)

8
src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java
View file

@ -1,15 +1,15 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import org.betterx.ui.layout.values.Value;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
import org.wunder.lib.ui.layout.values.Value;
@Environment(EnvType.CLIENT)
public class ConfirmRestartScreen extends BCLibLayoutScreen {

12
src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java
View file

@ -1,10 +1,5 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
@ -12,6 +7,11 @@ import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
@Environment(EnvType.CLIENT)
public class LevelFixErrorScreen extends BCLibLayoutScreen {
private final String[] errors;
@ -43,7 +43,7 @@ public class LevelFixErrorScreen extends BCLibLayoutScreen {
row.addText(fit(), fit(), dash);
row.addSpacer(4);
row.addText(fit(), fit(), Component.literal(error)).setColor(ColorUtil.RED);
row.addText(fit(), fit(), Component.literal(error)).setColor(ColorHelper.RED);
}
grid.addSpacer(8);

25
src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java
View file

@ -2,11 +2,6 @@ package org.betterx.bclib.client.gui.screens;
import org.betterx.bclib.api.v2.dataexchange.handler.autosync.HelloClient;
import org.betterx.bclib.util.Triple;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.Text;
import org.betterx.ui.layout.components.VerticalStack;
import org.betterx.worlds.together.util.ModUtil;
import org.betterx.worlds.together.util.PathUtil;
@ -18,6 +13,12 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.loader.api.metadata.ModEnvironment;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.Text;
import org.wunder.lib.ui.layout.components.VerticalStack;
import java.util.*;
import java.util.stream.Collectors;
@ -196,29 +197,29 @@ public class ModListScreen extends BCLibLayoutScreen {
final int state = t.second;
final String stateString = t.third;
int color = ColorUtil.RED;
int color = ColorHelper.RED;
final String typeText;
if (state == STATE_VERSION || state == STATE_VERSION_NOT_OFFERED || state == STATE_VERSION_CLIENT_ONLY) {
typeText = "[VERSION]";
if (state == STATE_VERSION_NOT_OFFERED) {
color = ColorUtil.YELLOW;
color = ColorHelper.YELLOW;
} else if (state == STATE_VERSION_CLIENT_ONLY) {
color = ColorUtil.DARK_GREEN;
color = ColorHelper.DARK_GREEN;
}
} else if (state == STATE_MISSING || state == STATE_MISSING_NOT_OFFERED) {
typeText = "[MISSING]";
if (state == STATE_MISSING_NOT_OFFERED) {
color = ColorUtil.YELLOW;
color = ColorHelper.YELLOW;
}
} else if (state == STATE_SERVER_MISSING || state == STATE_SERVER_MISSING_CLIENT_MOD) {
if (state == STATE_SERVER_MISSING_CLIENT_MOD) {
color = ColorUtil.AQUA;
color = ColorHelper.AQUA;
typeText = "[OK]";
} else {
typeText = "[NOT ON SERVER]";
}
} else {
color = ColorUtil.DARK_GREEN;
color = ColorHelper.DARK_GREEN;
typeText = "[OK]";
}
Component dash = Component.literal("-");
@ -237,7 +238,7 @@ public class ModListScreen extends BCLibLayoutScreen {
row = grid.addRow();
row.addSpacer(4 + dashText.getContentWidth());
row.addText(fit(), fit(), Component.literal(stateString))
.setColor(ColorUtil.GRAY);
.setColor(ColorHelper.GRAY);
}
grid.addSpacer(4);

13
src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java
View file

@ -1,11 +1,6 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.bclib.BCLib;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.layout.values.Rectangle;
import org.betterx.ui.layout.values.Value;
import org.betterx.ui.vanilla.LayoutScreen;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
@ -17,6 +12,12 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.ProgressListener;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.*;
import org.wunder.lib.ui.layout.values.Rectangle;
import org.wunder.lib.ui.layout.values.Value;
import org.wunder.lib.ui.vanilla.LayoutScreen;
import java.util.concurrent.atomic.AtomicInteger;
import org.jetbrains.annotations.Nullable;
@ -217,7 +218,7 @@ public class ProgressScreen extends LayoutScreen implements ProgressListener, At
VerticalStack textCol = contentRow.addColumn(fit(), fit()).setDebugName("textCol").centerVertical();
textCol.addText(fit(), fit(), description);
textCol.addSpacer(4);
progress = textCol.addText(fit(), fit(), getProgressComponent()).setColor(ColorUtil.GRAY);
progress = textCol.addText(fit(), fit(), getProgressComponent()).setColor(ColorHelper.GRAY);
grid.addSpacer(20);

9
src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java
View file

@ -1,10 +1,6 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.bclib.api.v2.dataexchange.handler.autosync.HelloClient;
import org.betterx.ui.layout.components.Checkbox;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import org.betterx.worlds.together.util.ModUtil;
import net.minecraft.client.Minecraft;
@ -14,6 +10,11 @@ import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.layout.components.Checkbox;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
@Environment(EnvType.CLIENT)
public class SyncFilesScreen extends BCLibLayoutScreen {
private final Component description;

21
src/main/java/org/betterx/bclib/client/gui/screens/UpdatesScreen.java
View file

@ -3,12 +3,6 @@ package org.betterx.bclib.client.gui.screens;
import org.betterx.bclib.BCLib;
import org.betterx.bclib.config.Configs;
import org.betterx.bclib.networking.VersionChecker;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import org.betterx.ui.layout.values.Size;
import org.betterx.ui.layout.values.Value;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiComponent;
@ -24,6 +18,13 @@ import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
import net.fabricmc.loader.api.metadata.CustomValue;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
import org.wunder.lib.ui.layout.values.Size;
import org.wunder.lib.ui.layout.values.Value;
@Environment(EnvType.CLIENT)
public class UpdatesScreen extends BCLibLayoutScreen {
public static final String DONATION_URL = "https://www.buymeacoffee.com/quiqueck";
@ -71,14 +72,14 @@ public class UpdatesScreen extends BCLibLayoutScreen {
}
if (nfo != null) {
row.addText(fit(), fit(), Component.literal(nfo.getMetadata().getName()))
.setColor(ColorUtil.WHITE);
.setColor(ColorHelper.WHITE);
} else {
row.addText(fit(), fit(), Component.literal(mod)).setColor(ColorUtil.WHITE);
row.addText(fit(), fit(), Component.literal(mod)).setColor(ColorHelper.WHITE);
}
row.addSpacer(4);
row.addText(fit(), fit(), Component.literal(cur));
row.addText(fit(), fit(), Component.literal(" -> "));
row.addText(fit(), fit(), Component.literal(updated)).setColor(ColorUtil.GREEN);
row.addText(fit(), fit(), Component.literal(updated)).setColor(ColorHelper.GREEN);
row.addFiller();
if (nfo != null && nfo.getMetadata().getContact().get("homepage").isPresent()) {
row.addButton(fit(), fit(), Component.translatable("bclib.updates.curseforge_link"))
@ -99,7 +100,7 @@ public class UpdatesScreen extends BCLibLayoutScreen {
footer.addButton(
fit(),
fit(),
Component.translatable("bclib.updates.donate").setStyle(Style.EMPTY.withColor(ColorUtil.YELLOW))
Component.translatable("bclib.updates.donate").setStyle(Style.EMPTY.withColor(ColorHelper.YELLOW))
)
.onPress((bt) -> openLink(DONATION_URL));
footer.addSpacer(2);

8
src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java
View file

@ -1,15 +1,15 @@
package org.betterx.bclib.client.gui.screens;
import org.betterx.ui.layout.components.HorizontalStack;
import org.betterx.ui.layout.components.LayoutComponent;
import org.betterx.ui.layout.components.VerticalStack;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.layout.components.HorizontalStack;
import org.wunder.lib.ui.layout.components.LayoutComponent;
import org.wunder.lib.ui.layout.components.VerticalStack;
@Environment(EnvType.CLIENT)
public class WarnBCLibVersionMismatch extends BCLibLayoutScreen {
private final Component description;

23
src/main/java/org/betterx/bclib/client/gui/screens/WelcomeScreen.java
View file

@ -4,9 +4,6 @@ import org.betterx.bclib.BCLib;
import org.betterx.bclib.config.Configs;
import org.betterx.bclib.networking.VersionChecker;
import org.betterx.bclib.registry.PresetsRegistry;
import org.betterx.ui.ColorUtil;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.layout.values.Size;
import org.betterx.worlds.together.WorldsTogether;
import org.betterx.worlds.together.worldPreset.WorldPresets;
@ -18,6 +15,10 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style;
import net.minecraft.resources.ResourceLocation;
import org.wunder.lib.ui.ColorHelper;
import org.wunder.lib.ui.layout.components.*;
import org.wunder.lib.ui.layout.values.Size;
public class WelcomeScreen extends BCLibLayoutScreen {
static final ResourceLocation BETTERX_LOCATION = new ResourceLocation(BCLib.MOD_ID, "betterx.png");
static final ResourceLocation BACKGROUND = new ResourceLocation(BCLib.MOD_ID, "header.jpg");
@ -33,12 +34,12 @@ public class WelcomeScreen extends BCLibLayoutScreen {
VerticalStack content = new VerticalStack(fill(), fit()).setDebugName("content");
content.addImage(fill(), fit(), BACKGROUND, new Size(427, 100));
content.addHorizontalLine(1).setColor(ColorUtil.BLACK);
content.addHorizontalLine(1).setColor(ColorHelper.BLACK);
content.addSpacer(16);
HorizontalStack headerRow = content.addRow(fit(), fit()).setDebugName("title bar").centerHorizontal();
headerRow.addIcon(icon, Size.of(512)).setDebugName("icon");
headerRow.addSpacer(4);
headerRow.addText(fit(), fit(), title).centerHorizontal().setColor(ColorUtil.WHITE).setDebugName("title");
headerRow.addText(fit(), fit(), title).centerHorizontal().setColor(ColorHelper.WHITE).setDebugName("title");
headerRow.addImage(fixed(178 / 2), fixed(40 / 2), BETTERX_LOCATION, Size.of(178, 40)).setDebugName("betterx");
content.addSpacer(16);
@ -61,7 +62,7 @@ public class WelcomeScreen extends BCLibLayoutScreen {
donationRow.addSpacer(4);
donationRow.addButton(
fit(), fit(),
Component.translatable("bclib.updates.donate").setStyle(Style.EMPTY.withColor(ColorUtil.YELLOW))
Component.translatable("bclib.updates.donate").setStyle(Style.EMPTY.withColor(ColorHelper.YELLOW))
)
.onPress((bt) -> openLink(UpdatesScreen.DONATION_URL)).centerVertical();
}
@ -81,7 +82,7 @@ public class WelcomeScreen extends BCLibLayoutScreen {
innerContent.addSpacer(2);
HorizontalStack dscBox = innerContent.indent(24);
dscBox.addMultilineText(fill(), fit(), translatable("description.config.bclib.client.version.check"))
.setColor(ColorUtil.GRAY);
.setColor(ColorHelper.GRAY);
dscBox.addSpacer(8);
// Hide Experimental Dialog
@ -102,7 +103,7 @@ public class WelcomeScreen extends BCLibLayoutScreen {
fit(),
translatable("description.config.bclib.client.ui.suppressExperimentalDialogOnLoad")
)
.setColor(ColorUtil.GRAY);
.setColor(ColorHelper.GRAY);
dscBox.addSpacer(8);
// Use BetterX WorldType
@ -123,16 +124,16 @@ public class WelcomeScreen extends BCLibLayoutScreen {
translatable("warning.config.bclib.client.ui.forceBetterXPreset")
.setStyle(Style.EMPTY
.withBold(true)
.withColor(ColorUtil.RED)
.withColor(ColorHelper.RED)
)
.append(translatable(
"description.config.bclib.client.ui.forceBetterXPreset").setStyle(
Style.EMPTY
.withBold(false)
.withColor(ColorUtil.GRAY))
.withColor(ColorHelper.GRAY))
)
)
.setColor(ColorUtil.GRAY);
.setColor(ColorHelper.GRAY);
dscBox.addSpacer(8);
innerContent.addSpacer(16);

11
src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java
View file

@ -6,11 +6,6 @@ import org.betterx.bclib.api.v2.generator.config.BCLEndBiomeSourceConfig;
import org.betterx.bclib.api.v2.generator.config.BCLNetherBiomeSourceConfig;
import org.betterx.bclib.api.v2.levelgen.LevelGenUtil;
import org.betterx.bclib.registry.PresetsRegistry;
import org.betterx.ui.layout.components.*;
import org.betterx.ui.layout.components.render.RenderHelper;
import org.betterx.ui.layout.values.Rectangle;
import org.betterx.ui.layout.values.Size;
import org.betterx.ui.vanilla.LayoutScreen;
import org.betterx.worlds.together.worldPreset.TogetherWorldPreset;
import org.betterx.worlds.together.worldPreset.WorldGenSettingsComponentAccessor;
@ -32,6 +27,12 @@ import net.minecraft.world.level.levelgen.presets.WorldPresets;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import org.wunder.lib.ui.layout.components.*;
import org.wunder.lib.ui.layout.components.render.RenderHelper;
import org.wunder.lib.ui.layout.values.Rectangle;
import org.wunder.lib.ui.layout.values.Size;
import org.wunder.lib.ui.vanilla.LayoutScreen;
import java.util.Map;
import java.util.Optional;
import org.jetbrains.annotations.Nullable;

1
src/main/java/org/betterx/bclib/util/ColorExtractor.java
View file

@ -1,5 +1,6 @@
package org.betterx.bclib.util;
import org.betterx.ui.ColorUtil;
import java.util.ArrayList;