[Feature] Build for 1.19.4
This commit is contained in:
Frank
parent
8a8e73348c
commit
55930d73d5
55 changed files with 380 additions and 304 deletions
|
|
@ -112,6 +112,18 @@ class ProgressLogoRender extends CustomRenderComponent<ProgressLogoRender> {
|
|||
);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean focused;
|
||||
|
||||
@Override
|
||||
public boolean isFocused() {
|
||||
return focused;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFocused(boolean bl) {
|
||||
focused = bl;
|
||||
}
|
||||
}
|
||||
|
||||
public class ProgressScreen extends LayoutScreen implements ProgressListener, AtomicProgressListener {
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@ 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.worlds.together.worldPreset.TogetherWorldPreset;
|
||||
import org.betterx.worlds.together.worldPreset.WorldGenSettingsComponentAccessor;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import net.minecraft.client.gui.GuiComponent;
|
||||
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationContext;
|
||||
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.network.chat.CommonComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
|
|
@ -22,6 +22,7 @@ import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
|||
import net.minecraft.world.level.dimension.DimensionType;
|
||||
import net.minecraft.world.level.dimension.LevelStem;
|
||||
import net.minecraft.world.level.levelgen.WorldDimensions;
|
||||
import net.minecraft.world.level.levelgen.presets.WorldPreset;
|
||||
import net.minecraft.world.level.levelgen.presets.WorldPresets;
|
||||
|
||||
import net.fabricmc.api.EnvType;
|
||||
|
|
@ -34,7 +35,6 @@ 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;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
|
|
@ -300,16 +300,14 @@ public class WorldSetupScreen extends LayoutScreen {
|
|||
updateConfiguration(LevelStem.NETHER, BuiltinDimensionTypes.NETHER, endGenerator);
|
||||
}
|
||||
|
||||
if (createWorldScreen.worldGenSettingsComponent instanceof WorldGenSettingsComponentAccessor acc
|
||||
&& acc.bcl_getPreset()
|
||||
.isPresent() && acc.bcl_getPreset()
|
||||
.get()
|
||||
.value() instanceof TogetherWorldPreset worldPreset) {
|
||||
acc.bcl_setPreset(Optional.of(Holder.direct(
|
||||
final WorldCreationUiState acc = createWorldScreen.getUiState();
|
||||
final Holder<WorldPreset> configuredPreset = acc.getWorldType().preset();
|
||||
if (configuredPreset != null && configuredPreset.value() instanceof TogetherWorldPreset worldPreset) {
|
||||
acc.setWorldType(new WorldCreationUiState.WorldTypeEntry(Holder.direct(
|
||||
worldPreset.withDimensions(
|
||||
createWorldScreen
|
||||
.worldGenSettingsComponent
|
||||
.settings()
|
||||
.getUiState()
|
||||
.getSettings()
|
||||
.selectedDimensions()
|
||||
.dimensions()
|
||||
)
|
||||
|
|
@ -323,7 +321,7 @@ public class WorldSetupScreen extends LayoutScreen {
|
|||
ResourceKey<DimensionType> dimensionTypeKey,
|
||||
ChunkGenerator chunkGenerator
|
||||
) {
|
||||
createWorldScreen.worldGenSettingsComponent.updateSettings(
|
||||
createWorldScreen.getUiState().updateDimensions(
|
||||
(registryAccess, worldDimensions) -> new WorldDimensions(LevelGenUtil.replaceGenerator(
|
||||
dimensionKey,
|
||||
dimensionTypeKey,
|
||||
|
|
@ -359,12 +357,10 @@ public class WorldSetupScreen extends LayoutScreen {
|
|||
protected LayoutComponent<?, ?> initContent() {
|
||||
BCLEndBiomeSourceConfig endConfig = BCLEndBiomeSourceConfig.VANILLA;
|
||||
BCLNetherBiomeSourceConfig netherConfig = BCLNetherBiomeSourceConfig.VANILLA;
|
||||
if (createWorldScreen.worldGenSettingsComponent instanceof WorldGenSettingsComponentAccessor acc
|
||||
&& acc.bcl_getPreset()
|
||||
.isPresent() && acc.bcl_getPreset()
|
||||
.get()
|
||||
.value() instanceof TogetherWorldPreset wp) {
|
||||
|
||||
final WorldCreationUiState acc = createWorldScreen.getUiState();
|
||||
final Holder<WorldPreset> configuredPreset = acc.getWorldType().preset();
|
||||
if (configuredPreset.value() instanceof TogetherWorldPreset wp) {
|
||||
LevelStem endStem = wp.getDimension(LevelStem.END);
|
||||
if (endStem != null && endStem.generator().getBiomeSource() instanceof BCLibEndBiomeSource bs) {
|
||||
endConfig = bs.getTogetherConfig();
|
||||
|
|
@ -375,8 +371,8 @@ public class WorldSetupScreen extends LayoutScreen {
|
|||
}
|
||||
}
|
||||
|
||||
var netherPage = netherPage(netherConfig);
|
||||
var endPage = endPage(endConfig);
|
||||
LayoutComponent<?, ? extends LayoutComponent<?, ?>> netherPage = netherPage(netherConfig);
|
||||
LayoutComponent<?, ? extends LayoutComponent<?, ?>> endPage = endPage(endConfig);
|
||||
|
||||
Tabs main = new Tabs(fill(), fill()).setPadding(8, 0, 0, 0);
|
||||
main.addPage(Component.translatable("title.bclib.the_nether"), VerticalScroll.create(netherPage));
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package org.betterx.bclib.client.render;
|
|||
import org.betterx.bclib.blockentities.BaseSignBlockEntity;
|
||||
import org.betterx.bclib.blocks.BaseSignBlock;
|
||||
|
||||
import com.mojang.blaze3d.platform.NativeImage;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
import com.mojang.math.Axis;
|
||||
|
|
@ -20,6 +19,7 @@ import net.minecraft.client.renderer.blockentity.SignRenderer;
|
|||
import net.minecraft.client.resources.model.Material;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.FastColor;
|
||||
import net.minecraft.util.FormattedCharSequence;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
|
|
@ -85,10 +85,10 @@ public class BaseSignBlockEntityRenderer implements BlockEntityRenderer<BaseSign
|
|||
matrixStack.translate(0.0D, 0.3333333432674408D, 0.046666666865348816D);
|
||||
matrixStack.scale(0.010416667F, -0.010416667F, 0.010416667F);
|
||||
int m = signBlockEntity.getColor().getTextColor();
|
||||
int n = (int) (NativeImage.getR(m) * 0.4D);
|
||||
int o = (int) (NativeImage.getG(m) * 0.4D);
|
||||
int p = (int) (NativeImage.getB(m) * 0.4D);
|
||||
int q = NativeImage.combine(0, p, o, n);
|
||||
int n = (int) (FastColor.ARGB32.red(m) * 0.4D);
|
||||
int o = (int) (FastColor.ARGB32.green(m) * 0.4D);
|
||||
int p = (int) (FastColor.ARGB32.blue(m) * 0.4D);
|
||||
int q = FastColor.ARGB32.color(0, p, o, n);
|
||||
|
||||
FormattedCharSequence[] formattedCharSequences = signBlockEntity.getRenderMessages(
|
||||
Minecraft.getInstance()
|
||||
|
|
@ -114,11 +114,12 @@ public class BaseSignBlockEntityRenderer implements BlockEntityRenderer<BaseSign
|
|||
for (int s = 0; s < 4; ++s) {
|
||||
FormattedCharSequence formattedCharSequence = formattedCharSequences[s];
|
||||
float t = (float) (-this.font.width(formattedCharSequence) / 2);
|
||||
int marginHeight = 4 * signBlockEntity.getTextLineHeight() / 2;
|
||||
if (drawOutlined) {
|
||||
this.font.drawInBatch8xOutline(
|
||||
formattedCharSequence,
|
||||
t,
|
||||
(float) (s * 10 - 20),
|
||||
(float) (s * signBlockEntity.getTextLineHeight() - marginHeight),
|
||||
drawColor,
|
||||
m,
|
||||
matrixStack.last().pose(),
|
||||
|
|
@ -129,12 +130,12 @@ public class BaseSignBlockEntityRenderer implements BlockEntityRenderer<BaseSign
|
|||
this.font.drawInBatch(
|
||||
formattedCharSequence,
|
||||
t,
|
||||
(float) (s * 10 - 20),
|
||||
(float) (s * signBlockEntity.getTextLineHeight() - marginHeight),
|
||||
drawColor,
|
||||
false,
|
||||
matrixStack.last().pose(),
|
||||
provider,
|
||||
false,
|
||||
Font.DisplayMode.NORMAL,
|
||||
0,
|
||||
drawLight
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue