Commit graph

3981 commits

Author SHA1 Message Date
Luke
d2a060b76e Create module subsystem under TShockAPI.Modules
This should allow for TShock.cs to be split up to mini-modules, or "micro-plugins"
2022-03-05 22:49:52 +10:00
Lucas Nicodemus
d3adc6db42 Merge branch 'general-devel' into otapi3 2022-02-28 22:32:22 -08:00
Lucas Nicodemus
0f13de4ee3 Version tick: 4.5.15 2022-02-28 14:04:34 -08:00
Lucas Nicodemus
aafed511a6 Swap 0 with PlayerAnnounceResult.None
In 44034c7649 I added a magic 0 instead of
a call to an enum because I was looking at an outdated diff that didn't
have `None` as an option. Turns out this was added a day later in a
commit I didn't see originally. Changed to `None` to make code better
documentation wise.
2022-02-28 00:34:28 -08:00
Lucas Nicodemus
44034c7649 Set args.Result to 0 in PlayerAnnounce hook
In
8204e2b3f9,
`PlayerAnnounceResult` was introduced, replacing `HookResult`, which changed
the result for `PlayerAnnounce` to a byte called `PlayerAnnounceResult`.
There are two options, `SendToPlayer` and `WriteToConsole`, set to 1 and 2
respectively. Because TShock handles this, we're setting it to 0, i.e.,
don't notify anybody.
2022-02-28 00:20:00 -08:00
Lucas Nicodemus
acde508c53 Merge branch 'general-devel' into otapi3 2022-02-28 00:15:06 -08:00
Lucas Nicodemus
92ea78f4c8 Remove Rpi doomsday scenario 2022-02-25 01:45:55 -08:00
Lucas Nicodemus
c21a80814f Verison tick: 4.5.14 2022-02-25 01:37:07 -08:00
Patrikkk
1b96ed8992 Adding EntitySource parameter to the used at NewNPC and NewItem methods.
I've decided to use the DebugCommand entity source for anything server related, as it makes the most sense as source. Feel free to discuss.
2022-02-25 04:42:16 +01:00
Chris
a3cde701f1
Merge branch 'general-devel' into general-devel 2022-02-22 19:17:08 +10:30
Chris
4aa75fe023
Add suggestion
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2022-02-22 19:15:58 +10:30
Chris
ed12236c52
Merge branch 'general-devel' into feature/grow-code-dupe 2022-02-22 18:51:01 +10:30
Lucas Nicodemus
4cb6a5eb4b Really version tick to 4.5.13 this time. 2022-02-16 19:55:06 -08:00
Lucas Nicodemus
6591b455fc Version tick: 4.5.13 2022-02-16 19:45:57 -08:00
Lucas Nicodemus
78169c87cb Merge remote-tracking branch 'origin/general-devel' into otapi3 2022-02-16 18:44:33 -08:00
0x3fcf1bbd
c6b04053a3
Removed clamping as the game does it itself. 2022-02-16 12:12:50 +01:00
0x3fcf1bbd
9bc936053b
Fixed STR width & length clamping being incorrect.
The main game should however clamp it itself too before sending, so there shouldn't be issues.
2022-02-16 11:32:43 +01:00
0x3fcf1bbd
874b3b2746 Reverted STS change, added STSC, fixed STS/STSC usage. 2022-02-01 16:00:05 +01:00
0x3fcf1bbd
af99c4cb8d
Fixed STS not being centered.
Inferring from the usage of it, this method was expected by its callers to be a square centered around the given coordinates (x, y), hence this being a fix.
2022-01-26 14:17:27 +01:00
0x3fcf1bbd
fc16495528
Fixed silent support for lanterns world event.
And fixed smol typo.
2022-01-22 13:47:19 +01:00
0x3fcf1bbd
29c6260d79
Fixed permission being ignored for lanterns event. 2022-01-16 17:13:57 +01:00
0x3fcf1bbd
5e54445818 Added lanterns night event to the worldevent command. 2022-01-15 23:49:37 +01:00
shell
add6c4cbee
Merge branch 'Pryaxis:general-devel' into general-devel 2022-01-03 20:03:19 +06:00
Lucas Nicodemus
724858b42d Merge branch 'general-devel' into otapi3 2021-12-12 12:36:31 -08:00
Lucas Nicodemus
e42da74f85 Merge remote-tracking branch 'tru321/general-devel' into general-devel 2021-12-12 12:35:13 -08:00
tru321
f20ce4aaa9
Update Bouncer.cs 2021-12-10 10:57:56 +08:00
tru321
e0d6252693
Update GetDataHandlers.cs 2021-12-10 10:53:58 +08:00
Lucas Nicodemus
dfaad68106 Merge branch 'general-devel' into otapi3 2021-12-08 22:55:11 -08:00
tru321
16f7c876e1
Apply suggestions from code review
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-12-08 14:44:03 +08:00
Lucas Nicodemus
deac238ea3 Version tick: 5.0.0 2021-12-07 21:09:04 -08:00
Lucas Nicodemus
c62fca5353 Merge remote-tracking branch 'deathcradle/otapi3' into otapi3 2021-12-07 21:06:48 -08:00
tru321
26a46ef40c
Update Bouncer.cs 2021-12-08 11:48:55 +08:00
tru321
d4befdeff0
Update Bouncer.cs 2021-12-08 11:10:12 +08:00
tru321
bd7b1c1460
Update GetDataHandlers.cs 2021-12-08 11:05:33 +08:00
James Puleo
e9b86b8f62
Improved the /grow command to reduce code duplication, use TileID
constants for less ambiguous types.
2021-12-07 03:12:39 -05:00
James Puleo
fe3a59f84a
Fixed rejection check inside of HandlePaintTile to account for the
Paint Sprayer (or Architect Gizmo Pack) being inside your inventory,
rather than on an accessory slot.
2021-12-07 02:42:27 -05:00
Lucas Nicodemus
f3b1a84821 Version tick: 4.5.12 2021-12-06 21:31:03 -08:00
Lucas Nicodemus
47b95e7518 Merge remote-tracking branch 'agaspace/patch-1' into general-devel 2021-12-05 16:32:06 -08:00
Lucas Nicodemus
d50ebfea37 Merge remote-tracking branch 'drunderscore/feature/bouncer-reject-out-of-bounds-npc-talk' into general-devel 2021-12-04 22:35:37 -08:00
Zoom L1
5230598ba3
Comments updated 2021-12-04 10:37:16 +07:00
James Puleo
4dab0802a1
Added the OnSignRead handler in GetDataHandlers, and added the
`SignRead` event.

Added check to ensure the sign being read is within world bounds (x >= 0
&& y >= 0 && x < Main.maxTilesX && y < Main.maxTilesY)
2021-12-03 21:11:23 -05:00
James Puleo
97f33fea63
Added check to HandleNpcTalk to ensure the passed NPC index is within
bounds (>= -1 && < `Main.maxNPCs`).
2021-12-03 19:57:46 -05:00
shell627
6155b31778 Merge remote-tracking branch 'upstream/general-devel' into general-devel 2021-12-03 15:40:37 +06:00
Luke
2c44f71043 CI upload artifacts + set tshock version to beta 2021-12-03 07:47:45 +10:00
Zoom L1
77ded28826
Corrected customDeathReason in OnPlayerDamage
Previously it was called for absolutely any damage from the player.
2021-12-02 22:13:25 +07:00
Lucas Nicodemus
ce056f1ce5 Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-12-01 22:59:04 -08:00
AkjaHAsLk1IALk0MasH
823293ed43 Updated code comments 2021-12-02 10:03:36 +07:00
tru321
0b1da29cf8
Update GetDataHandlers.cs 2021-12-01 14:35:02 +08:00
tru321
a2a13ce494
Added DataHandler for NpcTalk
This should stopping unregistered and logged out players to interact with NPC. Which prevent them smuggling or duplicating items via NPC items slot.
2021-12-01 13:44:41 +08:00
Luke
2b4b6353c2 Add TShock Launcher project (TShock.exe) with ./bin folder for dependencies
+ submodule update
TODO: retest on osx and see if we can include file permissions
2021-12-01 08:26:06 +10:00