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

Continue mapping migration

Browse source
This commit is contained in:
Aleksey 2021-04-12 21:38:22 +03:00
parent 99ade39404
commit f03fd03bd0
499 changed files with 12567 additions and 12723 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/ru/betterend/mixin/client/MinecraftClientMixin.java
View file

@ -7,19 +7,18 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.client.Minecraft;
import net.minecraft.client.RunArgs;
import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.color.item.ItemColors;
import net.minecraft.client.gui.hud.InGameHud;
import net.minecraft.client.gui.screen.CreditsScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.sound.MusicType;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.WinScreen;
import net.minecraft.client.main.GameConfig;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.sound.MusicSound;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.core.Registry;
import net.minecraft.sounds.Music;
import net.minecraft.sounds.Musics;
import net.minecraft.world.level.Level;
import ru.betterend.interfaces.IColorProvider;
import ru.betterend.util.MHelper;
@ -27,18 +26,18 @@ import ru.betterend.util.MHelper;
@Mixin(Minecraft.class)
public class MinecraftClientMixin {
@Shadow
public ClientPlayerEntity player;
public LocalPlayer player;
@Shadow
public Screen currentScreen;
@Shadow
@Final
public InGameHud inGameHud;
public Gui inGameHud;
@Shadow
public ClientLevel world;
@Shadow
@Final
private BlockColors blockColors;
@ -46,28 +45,27 @@ public class MinecraftClientMixin {
@Shadow
@Final
private ItemColors itemColors;
@Inject(method = "<init>*", at = @At("TAIL"))
private void be_onInit(RunArgs args, CallbackInfo info) {
private void be_onInit(GameConfig args, CallbackInfo info) {
Registry.BLOCK.forEach(block -> {
if (block instanceof IColorProvider) {
IColorProvider provider = (IColorProvider) block;
blockColors.registerColorProvider(provider.getBlockProvider(), block);
blockColors.register(provider.getProvider(), block);
itemColors.register(provider.getItemProvider(), block.asItem());
}
});
}
@Inject(method = "getMusicType", at = @At("HEAD"), cancellable = true)
private void be_getEndMusic(CallbackInfoReturnable<MusicSound> info) {
if (!(this.currentScreen instanceof CreditsScreen) && this.player != null) {
if (this.player.world.dimension() == Level.END) {
if (this.inGameHud.getBossBarHud().shouldPlayDragonMusic()
&& MHelper.lengthSqr(this.player.getX(), this.player.getZ()) < 250000) {
info.setReturnValue(MusicType.DRAGON);
} else {
MusicSound sound = (MusicSound) this.world.getBiomeAccess().method_27344(this.player.getBlockPos())
.getMusic().orElse(MusicType.END);
private void be_getEndMusic(CallbackInfoReturnable<Music> info) {
if (!(this.currentScreen instanceof WinScreen) && this.player != null) {
if (this.player.level.dimension() == Level.END) {
if (this.inGameHud.getBossOverlay().shouldPlayMusic() && MHelper.lengthSqr(this.player.getX(), this.player.getZ()) < 250000) {
info.setReturnValue(Musics.END_BOSS);
}
else {
Music sound = (Music) this.world.getBiomeManager().getNoiseBiomeAtPosition(this.player.blockPosition()).getBackgroundMusic().orElse(Musics.END);
info.setReturnValue(sound);
}
info.cancel();