Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.20.3 compatibility #39

Merged
merged 1 commit into from
Dec 5, 2023
Merged

1.20.3 compatibility #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.8
loader_version=0.14.21
minecraft_version=1.20.3
yarn_mappings=1.20.3+build.1
loader_version=0.15.0
#Fabric api
fabric_version=0.84.0+1.20.1
fabric_version=0.91.1+1.20.3

# Mod Properties
mod_version = 1.15.0-SNAPSHOT
Expand All @@ -19,7 +19,7 @@ archives_base_name = satin
findbugs_version = 3.0.2
jb_annotations_version = 18.0.0
apiguardian_version = 1.0.0
modmenu_version = 7.0.1
modmenu_version = 9.0.0-pre.1
iris_version = 1.6.3+1.19.4

#Publishing
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public abstract class WorldRendererMixin {
),
locals = LocalCapture.CAPTURE_FAILSOFT
)
private void renderCustom(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f positionMatrix, CallbackInfo ci, Profiler profiler, Vec3d vec3d, double x, double y, double z) {
private void renderCustom(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f projectionMatrix, CallbackInfo ci) {
// Render all the custom ones
for(RenderLayer layer : BlockRenderLayerRegistry.INSTANCE.getLayers()) {
renderLayer(layer, matrices, x, y, z, positionMatrix);
renderLayer(layer, matrices, camera.getPos().x, camera.getPos().y, camera.getPos().z, projectionMatrix);
}
}

Expand Down
Loading