Compare commits

...
Sign in to create a new pull request.

37 commits

Author SHA1 Message Date
Oth3r
597092b6be beta for snapshot 2025-03-12 18:45:52 -05:00
Oth3r
0c0f68e5bc add max minecraft version 2025-03-12 18:44:28 -05:00
Oth3r
c81b9f1c77 1.20.5-pre2 2025-03-12 18:44:15 -05:00
Oth3r
7a101e8a59 1.20.5 port 2025-03-12 18:43:43 -05:00
Oth3r
07fcbd54a2 Merge remote-tracking branch 'origin/snapshot' into snapshot
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
#	src/main/resources/fabric.mod.json
2025-03-12 18:25:46 -05:00
Oth3r
6da67e67b0 v1.1.4+1.20.5-pre1 2024-04-10 14:06:33 -05:00
Oth3r
28a46e9743 remove modmenu 2024-04-10 14:05:42 -05:00
Oth3r
d61031b821 fix merge errors 2024-04-10 14:05:36 -05:00
Oth3r
c6fb594d1f Merge branch 'master' into snapshot
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/java/one/oth3r/sit/Sit.java
#	src/main/java/one/oth3r/sit/SitClient.java
2024-04-10 12:12:42 -05:00
Oth3r
aac7476f52 s1.1.3+24w03b 2024-01-22 17:57:18 -06:00
Oth3r
189ae2d2b5 new packet system 1.20.5 2024-01-22 17:56:34 -06:00
Oth3r
7365b31f66 Merge branch 'master' into snapshot
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/resources/fabric.mod.json
2024-01-17 14:10:45 -06:00
Oth3r
90422345bc s1.1.0+1.20.3-pre1-1.20.3-rc1 2023-11-30 18:13:20 -06:00
Oth3r
021f979749 -modmenu 2023-11-30 18:12:37 -06:00
Oth3r
4c9432fd18 Merge branch '1.20-1.20.1' into snapshot
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/one/oth3r/sit/Events.java
#	src/main/java/one/oth3r/sit/ModMenu.java
#	src/main/resources/fabric.mod.json
2023-11-30 18:05:27 -06:00
Oth3r
eb3e10f738 s1.0.3+1.20.3-pre1 2023-11-20 12:10:38 -06:00
Oth3r
87e293d1d2 s1.0.3+23w46a 2023-11-16 18:10:53 -06:00
Oth3r
601fca3269 s1.0.3+23w45a 2023-11-08 14:01:09 -06:00
Oth3r
483255fe01 s1.0.3+23w44a 2023-11-01 14:15:46 -05:00
Oth3r
1b2adc2c7b v1.0.3+23w43b 2023-10-27 09:38:44 -05:00
Oth3r
a44a038feb v1.0.3+23w43a 2023-10-25 11:02:29 -05:00
Oth3r
879f755f19 s1.0.3+23w42a 2023-10-18 13:04:37 -05:00
Oth3r
3dc94270f6 fix the new blocklist 2023-10-18 13:02:57 -05:00
Oth3r
5f1564a53a b1.0.3+23w41a 2023-10-12 22:20:43 -05:00
Oth3r
fc7b734ef6 test for a strict list of blocks allowed above a sit entity 2023-10-12 22:20:06 -05:00
Oth3r
65e051c465 1.20.3 fixes 2023-10-12 22:19:34 -05:00
Oth3r
1dab3c8000 b1.0.2+1.20.2-rc1-1.20.2-rc2 2023-09-18 15:18:37 -05:00
Oth3r
c2819b08eb b1.0.2+1.20.2-rc1 2023-09-16 12:33:50 -05:00
Oth3r
8d5b0fb27a b1.0.2+1.20.2-pre4 2023-09-13 12:38:24 -05:00
Oth3r
f3b9e82cb4 b1.0.2+1.20.2-pre3 2023-09-12 12:41:58 -05:00
Oth3r
4b679b4126 b1.0.2+1.20.2-pre2 2023-09-07 14:26:09 -05:00
Oth3r
7b3b914934 b1.0.2+1.20.2-pre1 2023-09-05 16:46:36 -05:00
Oth3r
f4c29773d0 b1.0.2+23w35a 2023-09-01 14:17:37 -05:00
Oth3r
997c7c131a b1.0.2+23w33a 2023-08-17 12:38:17 -05:00
Oth3r
59875d0f6d b1.0.2+23w32a 2023-08-09 17:08:00 -05:00
Oth3r
68cf4532b4 b1.0.2+23w31a 2023-08-08 21:36:33 -05:00
Oth3r
ac7a373dd8 1.20.2 shifts everything down by .25 2023-08-08 21:35:05 -05:00
5 changed files with 11 additions and 15 deletions

View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.8-SNAPSHOT' id 'fabric-loom' version '1.10-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
id 'com.modrinth.minotaur' version '2.+' id 'com.modrinth.minotaur' version '2.+'
id 'net.darkhax.curseforgegradle' version '1.1.+' id 'net.darkhax.curseforgegradle' version '1.1.+'
@ -39,6 +39,7 @@ processResources {
version : project.version, version : project.version,
minecraft_version : minecraft_version, minecraft_version : minecraft_version,
min_minecraft_version : min_minecraft_version, min_minecraft_version : min_minecraft_version,
max_minecraft_version : max_minecraft_version,
loader_version : loader_version loader_version : loader_version
] ]
@ -92,7 +93,7 @@ modrinth {
projectId = 'EsYqsGV4' projectId = 'EsYqsGV4'
versionNumber = project.mod_version versionNumber = project.mod_version
versionName = "v${project.mod_version} [Fabric]" versionName = "v${project.mod_version} [Fabric]"
versionType = "release" versionType = "beta"
uploadFile = remapJar uploadFile = remapJar
gameVersions = [project.minecraft_version] gameVersions = [project.minecraft_version]
loaders = ['fabric', 'quilt'] loaders = ['fabric', 'quilt']
@ -112,6 +113,6 @@ tasks.register('publishCurseForge', TaskPublishCurseForge) {
mainFile.changelog = file('changelog.md') mainFile.changelog = file('changelog.md')
mainFile.displayName = "v${project.mod_version} [Fabric]" mainFile.displayName = "v${project.mod_version} [Fabric]"
mainFile.addModLoader("fabric", 'quilt') mainFile.addModLoader("fabric", 'quilt')
mainFile.releaseType = "release" mainFile.releaseType = "beta"
mainFile.addEnvironment("client", "server") mainFile.addEnvironment("client", "server")
} }

View file

@ -4,16 +4,17 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
min_minecraft_version=1.21.4 min_minecraft_version=1.21.5-beta.2
minecraft_version=1.21.4 max_minecraft_version=1.21.5
yarn_mappings=1.21.4+build.8 minecraft_version=1.21.5-pre2
yarn_mappings=1.21.5-pre2+build.2
loader_version=0.16.10 loader_version=0.16.10
# Mod Properties # Mod Properties
mod_version=1.2.3+1.21.4 mod_version=1.2.3+1.21.5-pre2-1.21.5
maven_group=one.oth3r maven_group=one.oth3r
file_name=sit! file_name=sit!
# Dependencies # Dependencies
fabric_version=0.116.1+1.21.4 fabric_version=0.118.6+1.21.5
modmenu_version=13.0.0-beta.1 modmenu_version=13.0.0-beta.1

View file

@ -21,8 +21,6 @@ public class ClickableImageWidget extends ButtonWidget {
@Override @Override
protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
RenderSystem.enableBlend();
RenderSystem.enableDepthTest();
context.drawTexture(RenderLayer::getGuiTextured, image, context.drawTexture(RenderLayer::getGuiTextured, image,
this.getX(), this.getY(), 0.0f, 0.0f, this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight()); this.getX(), this.getY(), 0.0f, 0.0f, this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight());
} }

View file

@ -71,11 +71,7 @@ public class ConfigScreen extends Screen {
} }
private void renderBanner(DrawContext context, int x, int y, float alpha) { private void renderBanner(DrawContext context, int x, int y, float alpha) {
RenderSystem.enableBlend();
context.drawTexture(RenderLayer::getGuiTextured,Identifier.of(Data.MOD_ID, "textures/gui/banner.png"), context.drawTexture(RenderLayer::getGuiTextured,Identifier.of(Data.MOD_ID, "textures/gui/banner.png"),
x, y, 0.0f, 0.0f, 128, 72, 128, 72, ColorHelper.getWhite(alpha)); x, y, 0.0f, 0.0f, 128, 72, 128, 72, ColorHelper.getWhite(alpha));
RenderSystem.disableBlend();
} }
} }

View file

@ -27,7 +27,7 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"minecraft": ">=${min_minecraft_version} <=${minecraft_version}", "minecraft": ">=${min_minecraft_version} <=${max_minecraft_version}",
"fabric": "*" "fabric": "*"
}, },
"suggests": { "suggests": {