-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support OptiFine_1.15.2_HD_U_G1_pre30. Fix #27.
- Loading branch information
1 parent
3169c09
commit 05e97f2
Showing
11 changed files
with
16 additions
and
382 deletions.
There are no files selected for viewing
This file contains 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 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 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
59 changes: 0 additions & 59 deletions
59
...erzhayard/optiforge/asm/mixins/net/minecraft/client/gui/MixinResourceLoadProgressGui.java
This file was deleted.
Oops, something went wrong.
80 changes: 5 additions & 75 deletions
80
...zekerzhayard/optiforge/asm/mixins/net/minecraft/client/renderer/MixinOverlayRenderer.java
This file contains 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,97 +1,27 @@ | ||
| package io.github.zekerzhayard.optiforge.asm.mixins.net.minecraft.client.renderer; | ||
|
|
||
| import com.mojang.blaze3d.matrix.MatrixStack; | ||
| import io.github.zekerzhayard.optiforge.asm.utils.annotations.DynamicShadow; | ||
| import io.github.zekerzhayard.optiforge.asm.utils.annotations.LazyOverwrite; | ||
| import io.github.zekerzhayard.optiforge.asm.utils.annotations.RedirectSurrogate; | ||
| import net.minecraft.block.BlockState; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.client.entity.player.ClientPlayerEntity; | ||
| import net.minecraft.client.renderer.OverlayRenderer; | ||
| import net.minecraft.client.renderer.texture.TextureAtlasSprite; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.fluid.Fluid; | ||
| import net.minecraft.tags.Tag; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraftforge.client.event.RenderBlockOverlayEvent; | ||
| import net.minecraftforge.event.ForgeEventFactory; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| /** | ||
| * {@link io.github.zekerzhayard.optiforge.asm.transformers.net.minecraft.client.renderer.OverlayRendererTransformer} | ||
| */ | ||
| @Mixin(OverlayRenderer.class) | ||
| public abstract class MixinOverlayRenderer { | ||
| @Shadow | ||
| private static void renderTexture(Minecraft minecraftIn, TextureAtlasSprite spriteIn, MatrixStack matrixStackIn) { | ||
|
|
||
| } | ||
|
|
||
| @Redirect( | ||
| method = "Lnet/minecraft/client/renderer/OverlayRenderer;renderOverlays(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/matrix/MatrixStack;)V", | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/client/renderer/OverlayRenderer;getViewBlockingState(Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/block/BlockState;" | ||
| ), | ||
| require = 1, | ||
| allow = 1 | ||
| ) | ||
| private static BlockState redirect$renderOverlays$0(PlayerEntity playerEntity, Minecraft minecraftIn, MatrixStack matrixStackIn) { | ||
| Pair<BlockState, BlockPos> overlay = MixinOverlayRenderer.getOverlayBlock(playerEntity); | ||
| if (overlay != null && !ForgeEventFactory.renderBlockOverlay(playerEntity, matrixStackIn, RenderBlockOverlayEvent.OverlayType.BLOCK, overlay.getLeft(), overlay.getRight())) { | ||
| MixinOverlayRenderer.renderTexture(minecraftIn, minecraftIn.getBlockRendererDispatcher().getBlockModelShapes().getTexture(overlay.getLeft(), minecraftIn.world, overlay.getRight()), matrixStackIn); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Redirect( | ||
| method = "Lnet/minecraft/client/renderer/OverlayRenderer;renderOverlays(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/matrix/MatrixStack;)V", | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/client/entity/player/ClientPlayerEntity;areEyesInFluid(Lnet/minecraft/tags/Tag;)Z" | ||
| ), | ||
| require = 1, | ||
| allow = 1 | ||
| ) | ||
| private static boolean redirect$renderOverlays$1(ClientPlayerEntity player, Tag<Fluid> tagIn, Minecraft minecraftIn, MatrixStack matrixStackIn) { | ||
| return false; | ||
| } | ||
|
|
||
| @RedirectSurrogate(loacalVariableOrdinals = 0) | ||
| private static boolean redirect$renderOverlays$1(ClientPlayerEntity player, Tag<Fluid> tagIn, Minecraft minecraftIn, MatrixStack matrixStackIn, PlayerEntity playerEntity) { | ||
| return player.areEyesInFluid(tagIn) && !ForgeEventFactory.renderWaterOverlay(playerEntity, matrixStackIn); | ||
| } | ||
|
|
||
| @Redirect( | ||
| method = "Lnet/minecraft/client/renderer/OverlayRenderer;renderOverlays(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/matrix/MatrixStack;)V", | ||
| method = "Lnet/minecraft/client/renderer/OverlayRenderer;getOverlayBlock(Lnet/minecraft/entity/player/PlayerEntity;)Lorg/apache/commons/lang3/tuple/Pair;", | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/client/entity/player/ClientPlayerEntity;isBurning()Z" | ||
| target = "Lorg/apache/commons/lang3/tuple/Pair;of(Ljava/lang/Object;Ljava/lang/Object;)Lorg/apache/commons/lang3/tuple/Pair;", | ||
| ordinal = 1 | ||
| ), | ||
| remap = false, | ||
| require = 1, | ||
| allow = 1 | ||
| ) | ||
| private static boolean redirect$renderOverlays$2(ClientPlayerEntity player, Minecraft minecraftIn, MatrixStack matrixStackIn) { | ||
| return false; | ||
| } | ||
|
|
||
| @RedirectSurrogate(loacalVariableOrdinals = 0) | ||
| private static boolean redirect$renderOverlays$2(ClientPlayerEntity player, Minecraft minecraftIn, MatrixStack matrixStackIn, PlayerEntity playerEntity) { | ||
| return player.isBurning() && !ForgeEventFactory.renderFireOverlay(playerEntity, matrixStackIn); | ||
| } | ||
|
|
||
| // getViewBlockingState | ||
| @LazyOverwrite(prefix = "optiforge_") | ||
| private static BlockState optiforge_func_230018_a_(PlayerEntity playerIn) { | ||
| return MixinOverlayRenderer.getOverlayBlock(playerIn).getLeft(); | ||
| } | ||
|
|
||
| @DynamicShadow | ||
| private static Pair<BlockState, BlockPos> getOverlayBlock(PlayerEntity playerIn) { | ||
| private static Pair<BlockState, BlockPos> redirect$getOverlayBlock$0(Object left, Object right) { | ||
| return null; | ||
| } | ||
| } |
This file contains 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
63 changes: 0 additions & 63 deletions
63
...ithub/zekerzhayard/optiforge/asm/mixins/net/minecraft/world/server/MixinChunkManager.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.