virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity
354 commits 12 branches 0 tags 59 MiB
Commit graph

57 commits

Author SHA1 Message Date
Oth3r
f7f67633e6 Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Events.java
 2025-05-20 12:53:07 -05:00
Oth3r
b7b3b39d82 Merge branch '1.21.4' into 1.21.1 
# Conflicts:
#	changelog.md
#	gradle.properties
#	src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
#	src/main/java/one/oth3r/sit/screen/ConfigScreen.java
#	src/main/java/one/oth3r/sit/screen/TextureButtonWidget.java
 2025-05-18 13:57:24 -05:00
Oth3r
c3b7bb02fd switch to CTxT 2025-05-03 15:41:16 -05:00
Oth3r
07b3077438 Merge branch 'master' into dev 2025-05-03 13:23:41 -05:00
Oth3r
4c5a928f84 port fix for 1.20.4 2025-05-03 12:24:40 -05:00
Oth3r
16608e0546 Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
#	src/main/java/one/oth3r/sit/utl/Utl.java
 2025-05-03 12:19:08 -05:00
Oth3r
05429194a9 Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-04-27 19:38:37 -05:00
Oth3r
b32efd0296 Merge branch '1.21.4' into 1.21.1 
# Conflicts:
#	gradle.properties
 2025-04-27 19:33:47 -05:00
Oth3r
b13f78d45c make extra sure that packets can be sent to the server 2025-04-19 19:39:49 -05:00
Oth3r
3a51c2add2 make extra sure that packets can be sent to the server 2025-04-19 19:38:55 -05:00
Oth3r
1fc549c51e fix sitting level being off 2025-04-08 14:03:46 -05:00
Oth3r
284930b1b6 update checkPlayerSitAbility() with the entity Y-adjustment in mind 2025-03-14 14:27:05 -05:00
Oth3r
242f107ffb real fix for #17 2025-03-14 14:10:12 -05:00
Oth3r
134496d7d0 Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2025-03-14 13:10:59 -05:00
Oth3r
f774802d69 Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-03-14 13:05:44 -05:00
Oth3r
2c4dc72f42 Merge branch '1.21.3' into 1.21.1 
# Conflicts:
#	gradle.properties
 2025-03-13 17:51:07 -05:00
Oth3r
9b7794dbb5 remove BlockState parameter of getSittingHeight() method and retrieve inside 2025-03-10 10:04:24 -05:00
Oth3r
248add0bc4 fixes #17 2025-03-09 14:55:48 -05:00
Oth3r
7658dbd40e Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2025-02-23 15:40:18 -06:00
Oth3r
a971fa9926 Merge branch '1.21.1' into 1.20.6 
# Conflicts:
#	gradle.properties
 2025-02-23 15:23:04 -06:00
Oth3r
41abc4d361 Merge branch '1.21.3' into 1.21.1 
# Conflicts:
#	gradle.properties
 2025-02-19 21:08:59 -06:00
Oth3r
abecde44c8 fix entity y adjustment system 2024-12-22 18:12:15 -06:00
Oth3r
18ad774e63 Merge branch '1.20.6' into 1.20.4 
# Conflicts:
#	gradle.properties
 2024-12-17 12:44:55 -06:00
Oth3r
fda08029bb Merge branch '1.21.3' into 1.21.1 
# Conflicts:
#	gradle.properties
 2024-12-15 11:36:25 -06:00
Oth3r
2b661a0fa8 Merge branch '1.21.3' into 1.20.6 
# Conflicts:
#	gradle.properties
 2024-12-11 14:46:32 -06:00
Oth3r
82d999c4c5 fix hand usable check and add block interaction list checking 2024-12-02 12:55:07 -06:00
Oth3r
6a471729d1 remove method change checking 2024-12-02 12:54:42 -06:00
Oth3r
9d6cc9b785 1.20.4 packet fix 2024-12-01 12:11:34 -06:00
Oth3r
32a4b0006a 1.20.6 port 2024-11-27 10:42:50 -06:00
Oth3r
77f59e7b6a 1.21.1 port 2024-11-25 13:16:24 -06:00
Oth3r
012778ba2b check the block below if occupied 2024-11-16 15:26:55 -06:00
Oth3r
f361a84d03 check for other players when sitting 2024-11-15 12:47:21 -06:00
Oth3r
09f5e31544 move sitEntities list to Data from FileData 2024-11-15 11:19:39 -06:00
Oth3r
de8b66d27a move filter presets to Filter.Presets 
add filter inverting
 2024-11-10 11:18:42 -06:00
Oth3r
ce8cd89320 better usable item detection 2024-11-10 10:57:53 -06:00
Oth3r
77cec2ff8c 1.21.3 port 2024-10-28 15:51:57 -05:00
Oth3r
bceb8e573a code cleanup 2024-10-19 17:54:35 -05:00
Oth3r
81f8cf6244 todo cleanup 2024-10-19 17:45:58 -05:00
Oth3r
7911765af8 better comments 2024-10-19 17:40:47 -05:00
Oth3r
ed86b67c18 changed blacklisted blocks into a customblock list 2024-10-19 17:40:37 -05:00
Oth3r
d3274d7302 lang update to not cause issues 2024-10-03 15:43:00 -05:00
Oth3r
73c98009ac count amount of entities purged and display in purge message 2024-09-30 14:15:34 -05:00
Oth3r
5de55e0e7a sit message tag 2024-09-30 14:14:58 -05:00
Oth3r
0738608811 fix default block sitting heights 2024-09-28 17:55:13 -05:00
Oth3r
4f85f0ace0 spelling 2024-09-21 20:10:30 -05:00
Oth3r
2bffecf784 new custom item json type, simplifying some things 2024-09-21 19:52:44 -05:00
Oth3r
e41f782aeb a new, better way of decting if a block has an interaction 2024-09-21 18:32:41 -05:00
Oth3r
a2a944da2f customblock to sittingblock & customblock base without sitting height 2024-09-20 22:24:17 -05:00
Oth3r
757ee9668a move entity spawning to the server loop to fix C2ME crash 
move checkplayers to Data from FileData
 2024-08-17 13:27:26 -05:00
Oth3r
4894d720c8 better(ish) interaction detecting for server fix 2024-08-13 13:02:39 -05:00