Skip to content

Commit 1a26089

Browse files
committed
make mod run on 1.21.2
1 parent 8fd5da4 commit 1a26089

File tree

18 files changed

+44
-23
lines changed

18 files changed

+44
-23
lines changed

src/main/java/org/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,32 @@
2626
import org.spongepowered.asm.mixin.Shadow;
2727
import org.spongepowered.asm.mixin.gen.Accessor;
2828

29+
import java.util.Iterator;
2930
import java.util.List;
30-
import java.util.Map;
31+
import java.util.Objects;
3132

3233
@Mixin(ShaderProgram.class)
3334
public abstract class CoreShaderMixin implements SamplerAccess {
34-
@Shadow @Final private Map<String, ShaderProgramDefinition.Sampler> samplers;
35+
@Shadow @Final private List<ShaderProgramDefinition.Sampler> samplers;
3536

3637
@Override
3738
public void satin$removeSampler(String name) {
38-
this.samplers.remove(name);
39+
for (Iterator<ShaderProgramDefinition.Sampler> iterator = this.samplers.iterator(); iterator.hasNext(); ) {
40+
ShaderProgramDefinition.Sampler sampler = iterator.next();
41+
if (Objects.equals(sampler.name(), name)) {
42+
iterator.remove();
43+
}
44+
}
3945
}
4046

4147
@Override
4248
public boolean satin$hasSampler(String name) {
43-
return this.samplers.containsKey(name);
49+
for (ShaderProgramDefinition.Sampler sampler : samplers) {
50+
if (sampler.name().equals(name)) {
51+
return true;
52+
}
53+
}
54+
return false;
4455
}
4556

4657
@Override
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"targets": {
3+
"swap": {}
4+
},
5+
"passes": [
6+
{
7+
"program": "satinbasictest:post/blit",
8+
"inputs": [
9+
{
10+
"sampler_name": "In",
11+
"target": "minecraft:main"
12+
}
13+
],
14+
"output": "swap"
15+
},
16+
{
17+
"name": "satinbasictest:post/blit",
18+
"inputs": [
19+
{
20+
"sampler_name": "In",
21+
"target": "swap"
22+
}
23+
],
24+
"output": "minecraft:main"
25+
}
26+
]
27+
}

src/testmod/resources/assets/satinbasictest/shaders/program/blit.fsh renamed to src/testmod/resources/assets/satinbasictest/shaders/post/blit.fsh

File renamed without changes.

src/testmod/resources/assets/satinbasictest/shaders/program/blit.json renamed to src/testmod/resources/assets/satinbasictest/shaders/post/blit.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"srcrgb": "srcalpha",
55
"dstrgb": "1-srcalpha"
66
},
7-
"vertex": "satinbasictest:blit",
8-
"fragment": "satinbasictest:blit",
7+
"vertex": "satinbasictest:post/blit",
8+
"fragment": "satinbasictest:post/blit",
99
"attributes": ["Position"],
1010
"samplers": [{
1111
"name": "DiffuseSampler"

src/testmod/resources/assets/satinbasictest/shaders/program/blit.vsh renamed to src/testmod/resources/assets/satinbasictest/shaders/post/blit.vsh

File renamed without changes.

src/testmod/resources/assets/satinbasictest/shaders/post_effect/blit.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/testmod/resources/assets/satincustomformattest/shaders/post/blit.json renamed to src/testmod/resources/assets/satincustomformattest/post_effect/blit.json

File renamed without changes.

src/testmod/resources/assets/satindepthtest/shaders/post/rainbow_ping.json renamed to src/testmod/resources/assets/satindepthtest/post_effect/rainbow_ping.json

File renamed without changes.

src/testmod/resources/assets/satindepthtest/shaders/program/rainbow_ping.fsh renamed to src/testmod/resources/assets/satindepthtest/shaders_old/program/rainbow_ping.fsh

File renamed without changes.

src/testmod/resources/assets/satindepthtest/shaders/program/rainbow_ping.json renamed to src/testmod/resources/assets/satindepthtest/shaders_old/program/rainbow_ping.json

File renamed without changes.

0 commit comments

Comments
 (0)