forked from Benimatic/twilightforest
-
Notifications
You must be signed in to change notification settings - Fork 242
Ported client classes to 26.1.x #2646
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.
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
Open
albazavr-alba
wants to merge
11
commits into
TeamTwilight:latest
Choose a base branch
from
albazavr-alba:port-client-classes
base: latest
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9e80f74
Client classes port
albazavr-alba a047a02
Merge branch '26.1.x' into port-client-classes
albazavr-alba 72dc82a
fix review comments for MovingCicadaSoundInstance.java
albazavr-alba bb021fd
accidently removed condition returned in MovingCicadaSoundInstance.java
albazavr-alba 5d36725
Resolved review comments
albazavr-alba df00fc6
Fixed GhastTearParticle and LockedBiomeToast
albazavr-alba 8be3fa2
Remove changes from TwilightForestRenderInfo
albazavr-alba 3b41f8d
Fixed UncraftingScreen
albazavr-alba 9add524
Reverted MagicPaintingAtlasInfo
albazavr-alba 2546151
Reverted TextureGeneratorReloadListener
albazavr-alba c547dbe
Fixed TFShaders
albazavr-alba File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,48 @@ | ||
| package twilightforest.client; | ||
|
|
||
| import net.minecraft.client.gui.GuiGraphics; | ||
| import net.minecraft.client.gui.Font; | ||
| import net.minecraft.client.gui.GuiGraphicsExtractor; | ||
| import net.minecraft.client.gui.components.toasts.Toast; | ||
| import net.minecraft.client.gui.components.toasts.ToastComponent; | ||
| import net.minecraft.client.gui.components.toasts.ToastManager; | ||
| import net.minecraft.client.renderer.RenderPipelines; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.resources.Identifier; | ||
| import net.minecraft.world.item.ItemStack; | ||
|
|
||
| public record LockedBiomeToast(ItemStack item) implements Toast { | ||
| public class LockedBiomeToast implements Toast { | ||
|
|
||
| private static final Component TITLE = Component.translatable("misc.twilightforest.biome_locked"); | ||
| private static final Component DESCRIPTION = Component.translatable("misc.twilightforest.biome_locked_2"); | ||
| private static final Identifier BACKGROUND_SPRITE = Identifier.withDefaultNamespace("toast/advancement"); | ||
|
|
||
| private final ItemStack item; | ||
| private Toast.Visibility wantedVisibility = Toast.Visibility.SHOW; | ||
|
|
||
| public LockedBiomeToast(ItemStack item) { | ||
| this.item = item; | ||
| } | ||
|
|
||
| public ItemStack item() { | ||
| return this.item; | ||
| } | ||
|
|
||
| @Override | ||
| public Visibility render(GuiGraphics graphics, ToastComponent component, long timer) { | ||
| graphics.blitSprite(BACKGROUND_SPRITE, 0, 0, this.width(), this.height()); | ||
| graphics.renderFakeItem(this.item(), 6, 8); | ||
| graphics.drawString(component.getMinecraft().font, TITLE, 25, 7, -256, false); | ||
| graphics.drawString(component.getMinecraft().font, DESCRIPTION, 25, 18, 16777215, false); | ||
| public Toast.Visibility getWantedVisibility() { | ||
| return this.wantedVisibility; | ||
| } | ||
|
|
||
| return timer >= 10000L ? Toast.Visibility.HIDE : Toast.Visibility.SHOW; | ||
| @Override | ||
| public void update(ToastManager toastManager, long timer) { | ||
| if (timer >= 10000L) { | ||
| this.wantedVisibility = Toast.Visibility.HIDE; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void extractRenderState(GuiGraphicsExtractor graphics, Font font, long timer) { | ||
| graphics.blitSprite(RenderPipelines.GUI_TEXTURED, BACKGROUND_SPRITE, 0, 0, this.width(), this.height()); | ||
| graphics.fakeItem(this.item(), 6, 8); | ||
| graphics.text(font, TITLE, 25, 7, -256, false); | ||
| graphics.text(font, DESCRIPTION, 25, 18, 16777215, false); | ||
| } | ||
| } | ||
4 changes: 0 additions & 4 deletions
4
src/main/java/twilightforest/client/MissingAdvancementToast.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,35 @@ | ||
| package twilightforest.client; | ||
|
|
||
| import com.mojang.blaze3d.shaders.Uniform; | ||
| import com.mojang.blaze3d.systems.RenderSystem; | ||
| import com.mojang.blaze3d.vertex.*; | ||
| import net.minecraft.client.renderer.ShaderInstance; | ||
| import com.mojang.blaze3d.pipeline.DepthStencilState; | ||
| import com.mojang.blaze3d.pipeline.RenderPipeline; | ||
| import com.mojang.blaze3d.platform.CompareOp; | ||
| import com.mojang.blaze3d.vertex.DefaultVertexFormat; | ||
| import com.mojang.blaze3d.vertex.VertexFormat; | ||
| import net.minecraft.client.renderer.RenderPipelines; | ||
| import net.minecraft.client.renderer.rendertype.RenderSetup; | ||
| import net.minecraft.client.renderer.rendertype.RenderType; | ||
| import net.minecraft.resources.Identifier; | ||
| import net.minecraft.server.packs.resources.ResourceProvider; | ||
| import net.neoforged.neoforge.client.event.RegisterShadersEvent; | ||
| import org.jetbrains.annotations.Nullable; | ||
| import twilightforest.TwilightForestMod; | ||
| import twilightforest.client.renderer.TFRenderPipelines; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Optional; | ||
|
|
||
| public class TFShaders { | ||
|
|
||
| public static ShaderInstance RED_THREAD; | ||
| public static PositionAwareShaderInstance AURORA; | ||
| private static final DepthStencilState TRANSLUCENT_DEPTH = new DepthStencilState(CompareOp.GREATER_THAN_OR_EQUAL, false); | ||
|
|
||
| public static void registerShaders(RegisterShadersEvent event) { | ||
| try { | ||
| event.registerShader(new ShaderInstance(event.getResourceProvider(), TwilightForestMod.prefix("red_thread/red_thread"), DefaultVertexFormat.BLOCK), | ||
| shader -> RED_THREAD = shader); | ||
| event.registerShader(new PositionAwareShaderInstance(event.getResourceProvider(), TwilightForestMod.prefix("aurora/aurora"), DefaultVertexFormat.POSITION_COLOR), | ||
| shader -> AURORA = (PositionAwareShaderInstance) shader); | ||
| } catch (IOException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| private static final RenderPipeline AURORA_PIPELINE = RenderPipeline.builder(RenderPipelines.DEBUG_FILLED_SNIPPET) | ||
| .withLocation(Identifier.fromNamespaceAndPath("twilightforest", "aurora/aurora")) | ||
| .withVertexFormat(DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS) | ||
| .withDepthStencilState(Optional.of(TRANSLUCENT_DEPTH)) | ||
| .build(); | ||
|
|
||
| public static class BindableShaderInstance extends ShaderInstance { | ||
|
|
||
| private ShaderInstance last; | ||
|
|
||
| public BindableShaderInstance(ResourceProvider p_173336_, Identifier shaderLocation, VertexFormat p_173338_) throws IOException { | ||
| super(p_173336_, shaderLocation, p_173338_); | ||
| } | ||
|
|
||
| ShaderInstance getSelf() { | ||
| return this; | ||
| } | ||
|
|
||
| public final void bind(@Nullable Runnable exec) { | ||
| last = RenderSystem.getShader(); | ||
| RenderSystem.setShader(this::getSelf); | ||
| if (exec != null) | ||
| exec.run(); | ||
| apply(); | ||
| } | ||
|
|
||
| public final void runThenClear(Runnable exec) { | ||
| exec.run(); | ||
| clear(); | ||
| RenderSystem.setShader(() -> last); | ||
| last = null; | ||
| } | ||
|
|
||
| public final void invokeThenClear(@Nullable Runnable execBind, Runnable execPost) { | ||
| bind(execBind); | ||
| runThenClear(execPost); | ||
| } | ||
|
|
||
| public final void invokeThenClear(Runnable execPost) { | ||
| invokeThenClear(null, execPost); | ||
| } | ||
|
|
||
| public final void invokeThenEndTesselator(@Nullable Runnable execBind, BufferBuilder builder) { | ||
| invokeThenClear(execBind, () -> BufferUploader.drawWithShader(builder.buildOrThrow())); | ||
| } | ||
|
|
||
| public final void invokeThenEndTesselator(BufferBuilder builder) { | ||
| invokeThenClear(() -> BufferUploader.drawWithShader(builder.buildOrThrow())); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| public static class PositionAwareShaderInstance extends BindableShaderInstance { | ||
|
|
||
| @Nullable | ||
| public final Uniform SEED; | ||
|
|
||
| @Nullable | ||
| public final Uniform POSITION; | ||
|
|
||
| public PositionAwareShaderInstance(ResourceProvider p_173336_, Identifier shaderLocation, VertexFormat p_173338_) throws IOException { | ||
| super(p_173336_, shaderLocation, p_173338_); | ||
| SEED = getUniform("SeedContext"); | ||
| POSITION = getUniform("PositionContext"); | ||
| } | ||
|
|
||
| public final void setValue(int seed, float x, float y, float z) { | ||
| if (SEED != null) { | ||
| SEED.set(seed); | ||
| } | ||
| if (POSITION != null) { | ||
| POSITION.set(x, y, z); | ||
| } | ||
| } | ||
|
|
||
| public final void setValueBindApply(int seed, float x, float y, float z) { | ||
| bind(() -> setValue(seed, x, y, z)); | ||
| } | ||
|
|
||
| public final void reset() { | ||
| setValue(0, 0, 0, 0); | ||
| } | ||
|
|
||
| public final void resetClear() { | ||
| runThenClear(this::reset); | ||
| } | ||
|
|
||
| public final void invokeThenClear(int seed, float x, float y, float z, Runnable exec) { | ||
| setValueBindApply(seed, x, y, z); | ||
| exec.run(); | ||
| resetClear(); | ||
| } | ||
|
|
||
| public final void invokeThenEndTesselator(int seed, float x, float y, float z, BufferBuilder builder) { | ||
| invokeThenClear(seed, x, y, z, () -> BufferUploader.drawWithShader(builder.buildOrThrow())); | ||
| } | ||
|
|
||
| } | ||
| public static final RenderType AURORA = RenderType.create( | ||
| "twilightforest_aurora", | ||
| RenderSetup.builder(AURORA_PIPELINE).createRenderSetup() | ||
|
albazavr-alba marked this conversation as resolved.
Outdated
|
||
| ); | ||
|
|
||
| public static final RenderType RED_THREAD = RenderType.create( | ||
| "twilightforest_red_thread", | ||
| RenderSetup.builder(TFRenderPipelines.RED_THREAD).createRenderSetup() | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.