-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Storage Blocks now render their channels in your inventory
- Loading branch information
kyrptonaught
committed
Dec 30, 2019
1 parent
a5f2346
commit 76f14ee
Showing
18 changed files
with
170 additions
and
83 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
34 changes: 0 additions & 34 deletions
34
src/main/java/net/kyrptonaught/linkedstorage/block/StorageBlockItem.java
This file was deleted.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
src/main/java/net/kyrptonaught/linkedstorage/client/DummyStorageBlockEntity.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,25 @@ | ||
| package net.kyrptonaught.linkedstorage.client; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry; | ||
| import net.kyrptonaught.linkedstorage.LinkedStorageModClient; | ||
| import net.kyrptonaught.linkedstorage.register.ModBlocks; | ||
| import net.minecraft.block.entity.BlockEntity; | ||
| import net.minecraft.block.entity.BlockEntityType; | ||
| @Environment(EnvType.CLIENT) | ||
| public class DummyStorageBlockEntity extends BlockEntity { | ||
| public DummyStorageBlockEntity() { | ||
| super(LinkedStorageModClient.dummy); | ||
| } | ||
|
|
||
| private byte[] dyeChannel; | ||
|
|
||
| public void setChannel(byte[] channel) { | ||
| this.dyeChannel = channel; | ||
| } | ||
|
|
||
| byte[] getChannel() { | ||
| return dyeChannel; | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
src/main/java/net/kyrptonaught/linkedstorage/client/DummyStorageBlockEntityRenderer.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,43 @@ | ||
| package net.kyrptonaught.linkedstorage.client; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.kyrptonaught.linkedstorage.LinkedStorageModClient; | ||
| import net.minecraft.client.render.RenderLayer; | ||
| import net.minecraft.client.render.TexturedRenderLayers; | ||
| import net.minecraft.client.render.VertexConsumer; | ||
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; | ||
| import net.minecraft.client.render.block.entity.BlockEntityRenderer; | ||
| import net.minecraft.client.util.SpriteIdentifier; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.util.DyeColor; | ||
| import net.minecraft.util.Identifier; | ||
| @Environment(EnvType.CLIENT) | ||
| public class DummyStorageBlockEntityRenderer extends BlockEntityRenderer<DummyStorageBlockEntity> { | ||
| private static final Identifier WOOL_TEXTURE = new Identifier("textures/block/white_wool.png"); | ||
|
|
||
| public DummyStorageBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher) { | ||
| super(dispatcher); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void render(DummyStorageBlockEntity blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| byte[] dyes = blockEntity.getChannel(); | ||
| float[] color1 = DyeColor.byId(dyes[0]).getColorComponents(); | ||
| float[] color2 = DyeColor.byId(dyes[1]).getColorComponents(); | ||
| float[] color3 = DyeColor.byId(dyes[2]).getColorComponents(); | ||
|
|
||
| LinkedChestModel model = new LinkedChestModel(); | ||
|
|
||
| //matrices.push(); | ||
| SpriteIdentifier spriteIdentifier = new SpriteIdentifier(TexturedRenderLayers.CHEST_ATLAS_TEXTURE, LinkedStorageModClient.TEXTURE); | ||
| VertexConsumer vertexConsumer = spriteIdentifier.getVertexConsumer(vertexConsumers, RenderLayer::getEntityCutout); | ||
| model.render(matrices, vertexConsumer, light, overlay); | ||
| model.button1.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityCutout(WOOL_TEXTURE)), light, overlay, color1[0], color1[1], color1[2], 1); | ||
| model.button2.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityCutout(WOOL_TEXTURE)), light, overlay, color2[0], color2[1], color2[2], 1); | ||
| model.button3.render(matrices, vertexConsumers.getBuffer(RenderLayer.getEntityCutout(WOOL_TEXTURE)), light, overlay, color3[0], color3[1], color3[2], 1); | ||
| // matrices.pop(); | ||
| } | ||
| } |
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
3 changes: 3 additions & 0 deletions
3
src/main/java/net/kyrptonaught/linkedstorage/client/StorageContainerScreen.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
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
33 changes: 33 additions & 0 deletions
33
src/main/java/net/kyrptonaught/linkedstorage/mixin/StorageBlockItemRenderMixin.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,33 @@ | ||
| package net.kyrptonaught.linkedstorage.mixin; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.kyrptonaught.linkedstorage.block.StorageBlock; | ||
| import net.kyrptonaught.linkedstorage.client.DummyStorageBlockEntity; | ||
| import net.kyrptonaught.linkedstorage.inventory.LinkedInventoryHelper; | ||
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; | ||
| import net.minecraft.client.render.item.BuiltinModelItemRenderer; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.item.BlockItem; | ||
| import net.minecraft.item.ItemStack; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
|
|
||
| @Mixin(BuiltinModelItemRenderer.class) | ||
| @Environment(EnvType.CLIENT) | ||
| public class StorageBlockItemRenderMixin { | ||
| private static DummyStorageBlockEntity DUMMY = new DummyStorageBlockEntity(); | ||
|
|
||
| @Inject(at = @At("HEAD"), method = "render", cancellable = true) | ||
| private void render(ItemStack itemStack, MatrixStack matrixStack, VertexConsumerProvider consumerProvider, int light, int overlay, CallbackInfo info) { | ||
| if (itemStack.getItem() instanceof BlockItem && ((BlockItem) itemStack.getItem()).getBlock() instanceof StorageBlock) { | ||
| DUMMY.setChannel(LinkedInventoryHelper.getItemChannelOrDefault(itemStack)); | ||
| BlockEntityRenderDispatcher.INSTANCE.renderEntity(DUMMY, matrixStack, consumerProvider, light, overlay); | ||
| info.cancel(); | ||
| } | ||
| } | ||
| } |
7 changes: 0 additions & 7 deletions
7
src/main/java/net/kyrptonaught/linkedstorage/register/ModBlocks.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
Oops, something went wrong.