-
-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'remotes/origin/Multiloader-1.20' into M…
…ultiloader-1.19.4
- Loading branch information
Showing
20 changed files
with
235 additions
and
63 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
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
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
19 changes: 19 additions & 0 deletions
19
common/src/main/java/org/vivecraft/mod_compat_vr/alexmobs/mixin/ClientEventsMixin.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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.vivecraft.mod_compat_vr.alexmobs.mixin; | ||
|
|
||
| import net.minecraft.client.Minecraft; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Pseudo | ||
| @Mixin(targets = "com.github.alexthe666.alexsmobs.client.event.ClientEvents") | ||
| public class ClientEventsMixin { | ||
| @Inject(at = @At("HEAD"), method = "onGetFluidRenderType", remap = false, cancellable = true) | ||
| private void vivecraft$fixNoPlayer(CallbackInfo ci) { | ||
| if (Minecraft.getInstance().player == null) { | ||
| ci.cancel(); | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
common/src/main/java/org/vivecraft/mod_compat_vr/blur/mixin/BlurMixin.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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package org.vivecraft.mod_compat_vr.blur.mixin; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
| import org.vivecraft.client_vr.VRState; | ||
|
|
||
| @Pseudo | ||
| @Mixin(targets = { | ||
| "com.tterrag.blur.Blur", | ||
| "de.cheaterpaul.blur.BlurClient" | ||
| }) | ||
| public class BlurMixin { | ||
| @Inject(at = @At("HEAD"), method = "getProgress", cancellable = true, remap = false) | ||
| private static void vivecraft$noBlurInVR(CallbackInfoReturnable<Float> cir) { | ||
| if (VRState.vrRunning) { | ||
| cir.setReturnValue(0.0F); | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
common/src/main/java/org/vivecraft/mod_compat_vr/cataclysm/mixin/ClientEventMixin.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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.vivecraft.mod_compat_vr.cataclysm.mixin; | ||
|
|
||
| import net.minecraft.client.Minecraft; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Pseudo; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Pseudo | ||
| @Mixin(targets = "com.github.L_Ender.cataclysm.client.event.ClientEvent") | ||
| public class ClientEventMixin { | ||
| @Inject(at = @At("HEAD"), method = "onGetFluidRenderType", remap = false, cancellable = true) | ||
| private void vivecraft$fixNoPlayer(CallbackInfo ci) { | ||
| if (Minecraft.getInstance().player == null) { | ||
| ci.cancel(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.