-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
175c07e
commit 5ae96b2
Showing
9 changed files
with
129 additions
and
20 deletions.
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
src/main/java/de/dafuqs/spectrum/injectors/MapDecorationInjector.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,12 @@ | ||
| package de.dafuqs.spectrum.injectors; | ||
|
|
||
| public interface MapDecorationInjector { | ||
|
|
||
| default void spectrum$setScale(byte scale) { | ||
| } | ||
|
|
||
| default byte spectrum$getScale() { | ||
| return 0; | ||
| } | ||
|
|
||
| } |
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
60 changes: 60 additions & 0 deletions
60
src/main/java/de/dafuqs/spectrum/mixin/MapDecorationMixin.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,60 @@ | ||
| package de.dafuqs.spectrum.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.wrapoperation.*; | ||
| import com.mojang.datafixers.util.*; | ||
| import de.dafuqs.spectrum.injectors.*; | ||
| import net.minecraft.item.map.*; | ||
| import net.minecraft.network.*; | ||
| import net.minecraft.network.codec.*; | ||
| import net.minecraft.registry.entry.*; | ||
| import net.minecraft.text.*; | ||
| import org.spongepowered.asm.mixin.*; | ||
| import org.spongepowered.asm.mixin.injection.*; | ||
|
|
||
| import java.util.*; | ||
| import java.util.function.*; | ||
|
|
||
| @Mixin(MapDecoration.class) | ||
| public class MapDecorationMixin implements MapDecorationInjector { | ||
|
|
||
| @Unique | ||
| private byte scale = 0; | ||
|
|
||
| @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/network/codec/PacketCodec;")) | ||
| private static PacketCodec<RegistryByteBuf, MapDecoration> wrapCodec( | ||
| PacketCodec<? super RegistryByteBuf, RegistryEntry<MapDecorationType>> codec1, Function<MapDecoration, RegistryEntry<MapDecorationType>> from1, | ||
| PacketCodec<? super RegistryByteBuf, Byte> codec2, Function<MapDecoration, Byte> from2, | ||
| PacketCodec<? super RegistryByteBuf, Byte> codec3, Function<MapDecoration, Byte> from3, | ||
| PacketCodec<? super RegistryByteBuf, Byte> codec4, Function<MapDecoration, Byte> from4, | ||
| PacketCodec<? super RegistryByteBuf, Optional<Text>> codec5, Function<MapDecoration, Optional<Text>> from5, | ||
| Function5<RegistryEntry<MapDecorationType>, Byte, Byte, Byte, Optional<Text>, MapDecoration> _to, | ||
| Operation<PacketCodec<RegistryByteBuf, MapDecoration>> original | ||
| ) { | ||
| PacketCodec<RegistryByteBuf, MapDecoration> codec = original.call(codec1, from1, codec2, from2, codec3, from3, codec4, from4, codec5, from5, _to); | ||
| return new PacketCodec<>() { | ||
| @Override | ||
| public void encode(RegistryByteBuf buf, MapDecoration value) { | ||
| codec.encode(buf, value); | ||
| buf.writeByte(value.spectrum$getScale()); | ||
| } | ||
|
|
||
| @Override | ||
| public MapDecoration decode(RegistryByteBuf buf) { | ||
| MapDecoration decoration = codec.decode(buf); | ||
| decoration.spectrum$setScale(buf.readByte()); | ||
| return decoration; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public void spectrum$setScale(byte scale) { | ||
| this.scale = scale; | ||
| } | ||
|
|
||
| @Override | ||
| public byte spectrum$getScale() { | ||
| return this.scale; | ||
| } | ||
|
|
||
| } |
20 changes: 20 additions & 0 deletions
20
src/main/java/de/dafuqs/spectrum/mixin/client/MapRendererMapTextureMixin.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,20 @@ | ||
| package de.dafuqs.spectrum.mixin.client; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.wrapoperation.*; | ||
| import com.llamalad7.mixinextras.sugar.*; | ||
| import net.minecraft.client.render.*; | ||
| import net.minecraft.client.util.math.*; | ||
| import net.minecraft.item.map.*; | ||
| import org.spongepowered.asm.mixin.*; | ||
| import org.spongepowered.asm.mixin.injection.*; | ||
|
|
||
| @Mixin(MapRenderer.MapTexture.class) | ||
| public class MapRendererMapTextureMixin { | ||
|
|
||
| @WrapOperation(method = "draw(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ZI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V")) | ||
| public void scaleDecorations(MatrixStack instance, float x, float y, float z, Operation<Void> original, @Local MapDecoration decoration) { | ||
| float scale = (float) ((int) decoration.spectrum$getScale() + 128) / 128; | ||
| original.call(instance, 4f * scale, 4f * scale, 3f * scale); | ||
| } | ||
|
|
||
| } |
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