Skip to content

Commit de7fd1c

Browse files
PepperCode1PepperCode1
committed
Merge remote-tracking branch 'origin/1.21.11/dev' into 1.21.11/mojmap
2 parents c6d7d15 + d4f7a9c commit de7fd1c

7 files changed

Lines changed: 138 additions & 14 deletions

File tree

‎src/main/java/me/pepperbell/continuity/client/mixin/BlockModelWrapperMixin.java‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
package me.pepperbell.continuity.client.mixin;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
import java.util.function.Function;
6+
7+
import org.jetbrains.annotations.Nullable;
8+
import org.spongepowered.asm.mixin.Mixin;
9+
import org.spongepowered.asm.mixin.Unique;
10+
import org.spongepowered.asm.mixin.injection.At;
11+
import org.spongepowered.asm.mixin.injection.Inject;
12+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
13+
14+
import com.llamalad7.mixinextras.sugar.Local;
15+
16+
import me.pepperbell.continuity.client.config.ContinuityConfig;
17+
import me.pepperbell.continuity.client.mixinterface.TextureAtlasSpriteExtension;
18+
import me.pepperbell.continuity.client.util.QuadUtil;
19+
import net.minecraft.client.color.item.ItemTintSource;
20+
import net.minecraft.client.multiplayer.ClientLevel;
21+
import net.minecraft.client.renderer.block.model.BakedQuad;
22+
import net.minecraft.client.renderer.item.BlockModelWrapper;
23+
import net.minecraft.client.renderer.item.ItemModelResolver;
24+
import net.minecraft.client.renderer.item.ItemStackRenderState;
25+
import net.minecraft.client.renderer.item.ModelRenderProperties;
26+
import net.minecraft.client.renderer.rendertype.RenderType;
27+
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
28+
import net.minecraft.world.entity.ItemOwner;
29+
import net.minecraft.world.item.ItemDisplayContext;
30+
import net.minecraft.world.item.ItemStack;
31+
32+
@Mixin(BlockModelWrapper.class)
33+
abstract class BlockModelWrapperMixin {
34+
@Unique
35+
private static final Object EMISSIVE_GEOMETRY_MARKER = new Object();
36+
37+
@Unique
38+
@Nullable
39+
private List<BakedQuad> emissiveQuads;
40+
@Unique
41+
private boolean emissiveAnimated = false;
42+
43+
@Inject(method = "<init>(Ljava/util/List;Ljava/util/List;Lnet/minecraft/client/renderer/item/ModelRenderProperties;Ljava/util/function/Function;)V", at = @At("RETURN"))
44+
private void onReturnInit(List<ItemTintSource> tints, List<BakedQuad> quads, ModelRenderProperties properties, Function<ItemStack, RenderType> renderType, CallbackInfo ci) {
45+
QuadUtil.PackedUvContainer output = new QuadUtil.PackedUvContainer();
46+
for (BakedQuad quad : quads) {
47+
TextureAtlasSprite emissiveSprite = ((TextureAtlasSpriteExtension) quad.sprite()).continuity$getEmissiveSprite();
48+
if (emissiveSprite != null) {
49+
QuadUtil.interpolate(quad, output, quad.sprite(), emissiveSprite);
50+
BakedQuad emissiveQuad = new BakedQuad(quad.position0(), quad.position1(), quad.position2(), quad.position3(), output.packedUV0, output.packedUV1, output.packedUV2, output.packedUV3, quad.tintIndex(), quad.direction(), emissiveSprite, false, 15);
51+
52+
if (emissiveQuads == null) {
53+
emissiveQuads = new ArrayList<>();
54+
}
55+
emissiveQuads.add(emissiveQuad);
56+
57+
if (emissiveSprite.contents().isAnimated()) {
58+
emissiveAnimated = true;
59+
}
60+
}
61+
}
62+
}
63+
64+
@Inject(method = "update(Lnet/minecraft/client/renderer/item/ItemStackRenderState;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/renderer/item/ItemModelResolver;Lnet/minecraft/world/item/ItemDisplayContext;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/ItemOwner;I)V", at = @At(value = "INVOKE", target = "java/util/List.addAll(Ljava/util/Collection;)Z", remap = false, shift = At.Shift.AFTER))
65+
private void afterAddVanillaQuads(ItemStackRenderState output, ItemStack item, ItemModelResolver resolver, ItemDisplayContext displayContext, @Nullable ClientLevel level, @Nullable ItemOwner owner, int seed, CallbackInfo ci, @Local ItemStackRenderState.LayerRenderState layer) {
66+
if (emissiveQuads != null && ContinuityConfig.INSTANCE.emissiveTextures.get()) {
67+
layer.prepareQuadList().addAll(emissiveQuads);
68+
output.appendModelIdentityElement(EMISSIVE_GEOMETRY_MARKER);
69+
70+
if (emissiveAnimated) {
71+
output.setAnimated();
72+
}
73+
}
74+
}
75+
}

‎src/main/java/me/pepperbell/continuity/client/resource/SpriteLoaderLoadContextImpl.java‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ public class SpriteLoaderLoadContextImpl implements SpriteLoaderLoadContext {
1414
private final CompletableFuture<Map<Identifier, Set<Identifier>>> allExtraIdsFuture;
1515
private final Map<Identifier, CompletableFuture<Set<Identifier>>> extraIdsFutures = new Object2ObjectOpenHashMap<>();
1616
private final SpriteLoaderLoadContext.EmissiveControl blockAtlasEmissiveControl;
17+
private final SpriteLoaderLoadContext.EmissiveControl itemAtlasEmissiveControl;
1718

1819
public SpriteLoaderLoadContextImpl(CompletableFuture<Map<Identifier, Set<Identifier>>> allExtraIdsFuture, CompletableFuture<Boolean> blockAtlasHasEmissivesFuture) {
1920
this.allExtraIdsFuture = allExtraIdsFuture;
2021
blockAtlasEmissiveControl = new EmissiveControlImpl(blockAtlasHasEmissivesFuture);
22+
itemAtlasEmissiveControl = new EmissiveControlImpl();
2123
}
2224

2325
@Override
@@ -30,19 +32,26 @@ public SpriteLoaderLoadContextImpl(CompletableFuture<Map<Identifier, Set<Identif
3032
public SpriteLoaderLoadContext.EmissiveControl getEmissiveControl(Identifier atlasId) {
3133
if (atlasId.equals(TextureAtlas.LOCATION_BLOCKS)) {
3234
return blockAtlasEmissiveControl;
35+
} else if (atlasId.equals(TextureAtlas.LOCATION_ITEMS)) {
36+
return itemAtlasEmissiveControl;
3337
}
3438
return null;
3539
}
3640

3741
private static class EmissiveControlImpl implements SpriteLoaderLoadContext.EmissiveControl {
3842
@Nullable
3943
private volatile Map<Identifier, Identifier> emissiveIdMap;
44+
@Nullable
4045
private final CompletableFuture<Boolean> hasEmissivesFuture;
4146

42-
public EmissiveControlImpl(CompletableFuture<Boolean> hasEmissivesFuture) {
47+
public EmissiveControlImpl(@Nullable CompletableFuture<Boolean> hasEmissivesFuture) {
4348
this.hasEmissivesFuture = hasEmissivesFuture;
4449
}
4550

51+
public EmissiveControlImpl() {
52+
this(null);
53+
}
54+
4655
@Override
4756
@Nullable
4857
public Map<Identifier, Identifier> getEmissiveIdMap() {
@@ -52,15 +61,19 @@ public Map<Identifier, Identifier> getEmissiveIdMap() {
5261
@Override
5362
public void setEmissiveIdMap(Map<Identifier, Identifier> emissiveIdMap) {
5463
if (emissiveIdMap.isEmpty()) {
55-
hasEmissivesFuture.complete(false);
64+
if (hasEmissivesFuture != null) {
65+
hasEmissivesFuture.complete(false);
66+
}
5667
} else {
5768
this.emissiveIdMap = emissiveIdMap;
5869
}
5970
}
6071

6172
@Override
6273
public void setHasEmissives(boolean hasEmissives) {
63-
hasEmissivesFuture.complete(hasEmissives);
74+
if (hasEmissivesFuture != null) {
75+
hasEmissivesFuture.complete(hasEmissives);
76+
}
6477
}
6578
}
6679
}

‎src/main/java/me/pepperbell/continuity/client/util/QuadUtil.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
77
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView;
88
import net.fabricmc.fabric.api.util.TriState;
9+
import net.minecraft.client.model.geom.builders.UVPair;
10+
import net.minecraft.client.renderer.block.model.BakedQuad;
911
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
1012
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1113
import net.minecraft.core.Direction;
@@ -26,6 +28,22 @@ public static void interpolate(MutableQuadView quad, TextureAtlasSprite oldSprit
2628
}
2729
}
2830

31+
public static void interpolate(BakedQuad quad, PackedUvContainer output, TextureAtlasSprite oldSprite, TextureAtlasSprite newSprite) {
32+
float oldMinU = oldSprite.getU0();
33+
float oldMinV = oldSprite.getV0();
34+
float newMinU = newSprite.getU0();
35+
float newMinV = newSprite.getV0();
36+
float uFactor = (newSprite.getU1() - newMinU) / (oldSprite.getU1() - oldMinU);
37+
float vFactor = (newSprite.getV1() - newMinV) / (oldSprite.getV1() - oldMinV);
38+
for (int i = 0; i < 4; i++) {
39+
long packedUv = quad.packedUV(i);
40+
output.packedUV(i, UVPair.pack(
41+
newMinU + (UVPair.unpackU(packedUv) - oldMinU) * uFactor,
42+
newMinV + (UVPair.unpackV(packedUv) - oldMinV) * vFactor
43+
));
44+
}
45+
}
46+
2947
public static void emitOverlayQuad(QuadEmitter emitter, Direction face, TextureAtlasSprite sprite, int color, @Nullable ChunkSectionLayer renderLayer, TriState ao) {
3048
emitter.square(face, 0, 0, 1, 1, 0);
3149
emitter.color(color, color, color, color);
@@ -160,4 +178,21 @@ public static int getTextureOrientation(QuadView quad) {
160178
// Add 4 if the UV winding order is clockwise
161179
return (Math.abs(y) >= Math.abs(x) ? (y > 0 ? 0 : 2) : (x > 0 ? 3 : 1)) + (determinant < 0 ? 4 : 0);
162180
}
181+
182+
public static class PackedUvContainer {
183+
public long packedUV0;
184+
public long packedUV1;
185+
public long packedUV2;
186+
public long packedUV3;
187+
188+
public void packedUV(int index, long packedUV) {
189+
switch (index) {
190+
case 0 -> packedUV0 = packedUV;
191+
case 1 -> packedUV1 = packedUV;
192+
case 2 -> packedUV2 = packedUV;
193+
case 3 -> packedUV3 = packedUV;
194+
default -> throw new IndexOutOfBoundsException(index);
195+
}
196+
}
197+
}
163198
}

‎src/main/java/me/pepperbell/continuity/client/util/RenderUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ public final class RenderUtil {
2020

2121
private static SpriteFinder blockAtlasSpriteFinder;
2222

23-
public static int getTintColor(@Nullable BlockState state, BlockAndTintGetter blockView, BlockPos pos, int tintIndex) {
23+
public static int getTintColor(@Nullable BlockState state, BlockAndTintGetter level, BlockPos pos, int tintIndex) {
2424
if (state == null || tintIndex == -1) {
2525
return -1;
2626
}
27-
return 0xFF000000 | BLOCK_COLORS.getColor(state, blockView, pos, tintIndex);
27+
return 0xFF000000 | BLOCK_COLORS.getColor(state, level, pos, tintIndex);
2828
}
2929

3030
public static TriState aoFromTintBlock(@Nullable BlockState tintBlock) {

‎src/main/resources/assets/continuity/lang/ko_kr.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"options.continuity.title": "Continuity 설정",
3-
"options.continuity.connected_textures": "연결된 텍스쳐",
4-
"options.continuity.connected_textures.tooltip": "블록의 연결된 텍스쳐를 활성화 하거나 비활성화 합니다.",
5-
"options.continuity.emissive_textures": "빛나는 텍스쳐",
6-
"options.continuity.emissive_textures.tooltip": "블록 및 아이템 모델의 빛나는 텍스쳐를 활성화 하거나 비활성화 합니다.",
7-
"options.continuity.custom_block_layers": "블록 레이어",
8-
"options.continuity.custom_block_layers.tooltip": "블록 레이어 사용자화를 활성화 하거나 비활성화 합니다.",
3+
"options.continuity.connected_textures": "연결된 텍스처",
4+
"options.continuity.connected_textures.tooltip": "블록에 대한 연결된 텍스처를 활성화하거나 비활성화합니다.",
5+
"options.continuity.emissive_textures": "빛나는 텍스처",
6+
"options.continuity.emissive_textures.tooltip": "블록 및 아이템 모델에 대한 빛나는 텍스처를 활성화하거나 비활성화합니다.",
7+
"options.continuity.custom_block_layers": "사용자 지정 블록 레이어",
8+
"options.continuity.custom_block_layers.tooltip": "사용자 지정 블록 레이어를 활성화하거나 비활성화합니다.",
99
"resourcePack.continuity.default.name": "기본 Continuity 텍스처",
1010
"resourcePack.continuity.default.description": "유리, 사암, 책장",
1111
"resourcePack.continuity.glass_pane_culling_fix.name": "유리판 컬링 수정",

‎src/main/resources/assets/continuity/lang/zlm_arab.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"options.continuity.title": "کونفيݢوراسي Continuity",
33
"options.continuity.connected_textures": "تيکستور برسامبوڠ",
4-
"options.continuity.connected_textures.tooltip": "دايکن اتاو ڽهدايکن تيکستور يڠ دسامبوڠکن اونتوق بلوک.",
4+
"options.continuity.connected_textures.tooltip": "داياکن اتاو ڽهداياکن تيکستور يڠ برسامبوڠ اونتوق بلوک.",
55
"options.continuity.emissive_textures": "تيکستور ايميسيف",
6-
"options.continuity.emissive_textures.tooltip": "دايکن اتاو ڽهدايکن تيکستور ايميسيف اونتوق موديل بلوک دان اءيتم.",
6+
"options.continuity.emissive_textures.tooltip": "داياکن اتاو ڽهدايکن تيکستور ايميسيف اونتوق موديل بلوک دان اٴيتم.",
77
"options.continuity.custom_block_layers": "لاڤيسن بلوک ترسواي",
8-
"options.continuity.custom_block_layers.tooltip": "دايکن اتاو ڽهدايکن لاڤيسن بلوک ترسواي."
8+
"options.continuity.custom_block_layers.tooltip": "داياکن اتاو ڽهداياکن لاڤيسن بلوک ترسواي."
99
}

‎src/main/resources/continuity.mixins.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"compatibilityLevel": "JAVA_21",
66
"client": [
77
"AtlasManagerMixin",
8+
"BlockModelWrapperMixin",
89
"ItemBlockRenderTypesMixin",
910
"MultiPackResourceManagerMixin",
1011
"SpriteLoaderMixin",

0 commit comments

Comments
 (0)