Motschen/VisualOverhaul
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/VisualOverhaul.git synced 2025-12-15 21:55:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to make Phonos compat work again

Browse Source 
For some reason, the Phonos compat classes aren't getting remapped correctly, causing a crash.
This commit is contained in:
Motschen
2022-11-20 18:55:17 +01:00
parent 2eb56f0d95
commit 94c6929099
11 changed files with 145 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/RadioJukeboxTop.java
View File

@@ -1,24 +0,0 @@
package eu.midnightdust.visualoverhaul.compat.phonos.block;
//import io.github.foundationgames.phonos.block.PhonosBlocks;
//import io.github.foundationgames.phonos.block.RadioJukeboxBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.IntProperty;
//public class RadioJukeboxTop extends Block {
// public static final BooleanProperty PLAYING = RadioJukeboxBlock.PLAYING;
// public static final IntProperty CHANNEL = RadioJukeboxBlock.CHANNEL;
//
// public RadioJukeboxTop() {
// super(FabricBlockSettings.copy(PhonosBlocks.RADIO_JUKEBOX));
// this.setDefaultState(this.stateManager.getDefaultState());
// }
//
// @Override
// protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
// builder.add(PLAYING, CHANNEL);
// }
//}

74
common/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/block/renderer/RadioJukeboxBlockEntityRenderer.java
View File

@@ -1,74 +0,0 @@
package eu.midnightdust.visualoverhaul.compat.phonos.block.renderer;
//
//import eu.midnightdust.visualoverhaul.compat.phonos.block.RadioJukeboxTop;
//import eu.midnightdust.visualoverhaul.compat.phonos.init.PhonosCompatInit;
//import eu.midnightdust.visualoverhaul.config.VOConfig;
//import io.github.foundationgames.phonos.block.RadioJukeboxBlock;
//import io.github.foundationgames.phonos.block.entity.RadioJukeboxBlockEntity;
//import net.fabricmc.api.EnvType;
//import net.fabricmc.api.Environment;
//import net.minecraft.block.BlockState;
//import net.minecraft.block.Blocks;
//import net.minecraft.client.MinecraftClient;
//import net.minecraft.client.render.RenderLayer;
//import net.minecraft.client.render.VertexConsumerProvider;
//import net.minecraft.client.render.WorldRenderer;
//import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
//import net.minecraft.client.render.block.entity.BlockEntityRenderer;
//import net.minecraft.client.render.model.json.ModelTransformation;
//import net.minecraft.client.util.math.MatrixStack;
//import net.minecraft.item.ItemStack;
//
//import java.util.Random;
//
//@Environment(EnvType.CLIENT)
//public class RadioJukeboxBlockEntityRenderer implements BlockEntityRenderer<RadioJukeboxBlockEntity> {
// private ItemStack record;
// private float rotation = 0;
// private BlockState blockState;
//
// public RadioJukeboxBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) {
// super();
// }
//
// @Override
// public void render(RadioJukeboxBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) {
// if (VOConfig.jukebox) {
// int lightAbove = WorldRenderer.getLightmapCoordinates(blockEntity.getWorld(), blockEntity.getPos().up());
//
// // Tries to get the disc using the serverside method
// if (blockEntity.getStack(blockEntity.getPlayingSong()) != ItemStack.EMPTY) {
// record = blockEntity.getStack(blockEntity.getPlayingSong()).copy();
// record.setCount(2);
// }
// // If the sound is stopped or no sound is playing, the stack is set to an empty stack //
// else {
// record = ItemStack.EMPTY;
// }
//
// matrices.push();
//
// matrices.translate(0.5f, 1.03f, 0.5f);
// matrices.scale(0.75f, 0.75f, 0.75f);
//
// if (blockEntity.isPlaying()) {
// rotation = (blockEntity.getWorld().getTime() + tickDelta) * 4;
// }
// matrices.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotation));
// MinecraftClient.getInstance().getItemRenderer().renderItem(record, ModelTransformation.Mode.GROUND, lightAbove, overlay, matrices, vertexConsumers);
//
// matrices.pop();
// if (VOConfig.jukebox_fake_block && blockEntity.getWorld().getBlockState(blockEntity.getPos().up()).getBlock() == Blocks.AIR) {
// blockState = blockEntity.getWorld().getBlockState(blockEntity.getPos());
// matrices.push();
// matrices.translate(0f, 1f, 0f);
// if (record == ItemStack.EMPTY) {
// MinecraftClient.getInstance().getBlockRenderManager().renderBlock(PhonosCompatInit.RadioJukeboxTop.getDefaultState().with(RadioJukeboxTop.PLAYING, false).with(RadioJukeboxTop.CHANNEL, blockState.get(RadioJukeboxBlock.CHANNEL)), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random());
// } else {
// MinecraftClient.getInstance().getBlockRenderManager().renderBlock(PhonosCompatInit.RadioJukeboxTop.getDefaultState().with(RadioJukeboxTop.PLAYING, true).with(RadioJukeboxTop.CHANNEL, blockState.get(RadioJukeboxBlock.CHANNEL)), blockEntity.getPos().up(), blockEntity.getWorld(), matrices, vertexConsumers.getBuffer(RenderLayer.getCutout()), false, new Random());
// }
// matrices.pop();
// }
// }
// }
//}

19
common/src/main/java/eu/midnightdust/visualoverhaul/compat/phonos/init/PhonosCompatInit.java
View File

@@ -1,19 +0,0 @@
package eu.midnightdust.visualoverhaul.compat.phonos.init;
//import eu.midnightdust.visualoverhaul.compat.phonos.block.RadioJukeboxTop;
//import io.github.foundationgames.phonos.block.PhonosBlocks;
import net.minecraft.block.Block;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
public class PhonosCompatInit {
//public static Block RadioJukeboxTop = new RadioJukeboxTop();
public static void init() {
//Registry.register(Registry.BLOCK, new Identifier("visualoverhaul","radio_jukebox_top"), RadioJukeboxTop);
//BlockRenderLayerMapImpl.INSTANCE.putBlock(PhonosBlocks.RADIO_JUKEBOX, RenderLayer.getCutout());
//BlockRenderLayerMapImpl.INSTANCE.putBlock(RadioJukeboxTop, RenderLayer.getCutout());
}
}