Skip to content

Revert date library #8

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

Merged
zoephix merged 7 commits into from
Feb 14, 2021
Merged

Revert date library #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e863fb2
Update README.md
TovarischPootis Feb 14, 2021
1f1b4c0
Fix some items acting as uninteractable watermelons
TovarischPootis Feb 14, 2021
db86944
Update nut_item.lua
TovarischPootis Feb 14, 2021
1df4cf3
Merge pull request #4 from TovarischPootis/1.2-wip
zoephix Feb 14, 2021
bf31979
Merge pull request #6 from NutScript/1.2
zoephix Feb 14, 2021
b9e50bb
Merge pull request #1 from NutScript/1.2-wip
zoephix Feb 14, 2021
78c54a4
Revert date library
zoephix Feb 14, 2021
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
20 changes: 13 additions & 7 deletions entities/entities/nut_item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ENT.RenderGroup = RENDERGROUP_BOTH

if (SERVER) then
function ENT:Initialize()
self:SetModel("models/props_junk/watermelon01.mdl")
self:SetSolid(SOLID_VPHYSICS)
self:PhysicsInit(SOLID_VPHYSICS)
--self:SetModel("models/props_junk/watermelon01.mdl")
--self:SetSolid(SOLID_VPHYSICS)
--self:PhysicsInit(SOLID_VPHYSICS)
self:SetCollisionGroup(COLLISION_GROUP_WEAPON)
self.health = 50

Expand Down Expand Up @@ -51,14 +51,20 @@ if (SERVER) then
and "models/props_junk/cardboard_box004a.mdl"
or itemTable.worldModel
end

self:SetModel(model or "models/props_junk/watermelon01.mdl")
self:SetSkin(itemTable.skin or 0)
self:SetModel(model)

if itemTable.groups then -- this has to be done after the model is set, hence why it looks a little messy
for k, v in pairs(itemTable.groups) do
if isstring(k) then k = self:FindBodygroupByName(k) end
self:SetBodygroup(k, v)
end
end

self:PhysicsInit(SOLID_VPHYSICS)
self:SetSolid(SOLID_VPHYSICS)
self:setNetVar("id", itemTable.uniqueID)
self.nutItemID = itemID

if (table.Count(itemTable.data) > 0) then
self:setNetVar("data", itemTable.data)
end
Expand Down Expand Up @@ -205,4 +211,4 @@ function ENT:getData(key, default)
return default
end
return data[key]
end
end
180 changes: 27 additions & 153 deletions gamemode/core/libs/sh_date.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,181 +1,55 @@
---------------------------------------------------------------------------------------
-- Module for date and time calculations
--
-- Version 2.1.2
-- Copyright (C) 2006, by Jas Latrix ([email protected])
-- Copyright (C) 2013-2014, by Thijs Schreijer
-- Licensed under MIT, http://opensource.org/licenses/MIT
-- https://github.com/Tieske/date
-- The MIT License (MIT) http://opensource.org/licenses/MIT

-- Copyright (c) 2013-2017 Thijs Schreijer
-- Copyright (c) 2018 Alexander Grist-Hucker, Igor Radovanovic

-- lib based on Helix by Alexander Grist-Hucker, Igor Radovanovic 2018

-- due to UNIX time, normal os.time() cannnot be set before 1970, as 1st Jan 1970 is 0
-- the library fixes said issue.


nut.date = nut.date or {}
nut.date.lib = nut.date.lib or include("thirdparty/sh_date.lua")
nut.date.timeScale = nut.date.timeScale or nut.config.get("secondsPerMinute", 60)
nut.date.dateObj = nut.date.dateObj or nut.date.lib()
nut.date.start = nut.date.start or CurTime()
nut.date.cache = nut.date.cache or {}
nut.date.start = nut.date.start or os.time()

if (not nut.config) then
if (!nut.config) then
include("nutscript/gamemode/core/sh_config.lua")
end

nut.config.add("year", 2021, "The starting year of the schema.", function(oldValue, newValue)
if (SERVER and not nut.date.saving) then
nut.date.update()
nut.date.dateObj:setyear(newValue)
nut.date.sync()
end
end, {
nut.config.add("year", 2015, "The starting year of the schema.", nil, {
data = {min = 0, max = 4000},
category = "date"
})

nut.config.add("month", 1, "The starting month of the schema.", function(oldValue, newValue)
if (SERVER and not nut.date.saving) then
nut.date.update()
nut.date.dateObj:setmonth(newValue)
nut.date.sync()
end
end, {
nut.config.add("month", 1, "The starting month of the schema.", nil, {
data = {min = 1, max = 12},
category = "date"
})

nut.config.add("day", 1, "The starting day of the schema.", function(oldValue, newValue)
if (SERVER and not nut.date.saving) then
nut.date.update()
nut.date.dateObj:setday(newValue)
nut.date.sync()
end
end, {
nut.config.add("day", 1, "The starting day of the schema.", nil, {
data = {min = 1, max = 31},
category = "date"
})

nut.config.add("secondsPerMinute", 60, "How many real life seconds it takes for a minute to pass in-game.", function(oldValue, newValue)
if (SERVER and not nut.date.saving) then
nut.date.updateTimescale(newValue)
nut.date.sync()
end
end, {
data = {min = 0.01, max = 120},
category = "date"
})

nut.config.add("yearAppendix", "", "Add a custom appendix to your date, if you use a non-conventional calender", nil, {
data = {form = "Generic"},
category = "date"
})

if (SERVER) then
util.AddNetworkString("nutDateSync")

-- called upon server startup. Grabs the saved date data, or creates a new date instance, and sets it as the date object
function nut.date.initialize()
local currentDate = nut.data.get("date", nil, false, true)
-- If we don't have date data already, use current defaults to create a new date data table
if (not currentDate) then
currentDate = {
year = nut.config.get("year"),
month = nut.config.get("month"),
day = nut.config.get("day"),
hour = tonumber(os.date("%H")) or 0,
min = tonumber(os.date("%M")) or 0,
sec = tonumber(os.date("%S")) or 0,
}

currentDate = nut.date.lib.serialize(nut.date.lib(currentDate))

nut.data.set("date", currentDate, false, true) -- save the new data
end

nut.date.timeScale = nut.config.get("secondsPerMinute", 60)
nut.date.dateObj = nut.date.lib.construct(currentDate) -- update the date object with the initialized data
end
function nut.date.get()
local unixTime = os.time()

-- Called when date values have been manually changed, updating the date object.
function nut.date.update()
nut.date.dateObj = nut.date.get()
nut.date.start = CurTime()
return (unixTime - (nut.date.start or unixTime)) + os.time({
year = nut.config.get("year"),
month = nut.config.get("month"),
day = nut.config.get("day")
})
end

-- This is an internal function that sets the amount of real life seconds in an ingame minute. While you can use this function,
--you probably shouldn't, and rather use the ingame config.
function nut.date.updateTimescale(secondsPerMinute)
nut.date.update()
nut.date.timeScale = secondsPerMinute
end

--Syncs the current date with the client/s. This allows the players to have proper date representation, such as in the F1menu.
function nut.date.sync(client)
net.Start("nutDateSync")
net.WriteFloat(nut.date.timeScale)
net.WriteTable(nut.date.dateObj)
net.WriteFloat(nut.date.start)

if (client) then
net.Send(client)
else
net.Broadcast()
end
end

-- saves the current in-game date data.
function nut.date.save()
nut.date.saving = true -- prevents from the function from being called before it finishes.

nut.date.update()

nut.data.set("date", nut.date.lib.serialize(nut.date.dateObj), false, true) -- saves the current data object

-- update config to reflect current saved date
nut.config.set("year", nut.date.dateObj:getyear())
nut.config.set("month", nut.date.dateObj:getmonth())
nut.config.set("day", nut.date.dateObj:getday())

nut.date.saving = nil -- allows the date to be saved again
function nut.date.send(client)
netstream.Start(client, "dateSync", CurTime(), os.time() - nut.date.start)
end
else
net.Receive("nutDateSync", function() -- set the clientside values to the updated serverside date values
nut.date.timeScale = net.ReadFloat()
nut.date.dateObj = nut.date.lib.construct(net.ReadTable())
nut.date.start = net.ReadFloat()
print("synced")
PrintTable(nut.date.dateObj)
end)
end

--- Returns the currently set date.
function nut.date.get()
-- CurTime increases in value by 1 every second. By getting the difference in seconds between now and the date object initialization,
local minutesSinceStart = (CurTime() - nut.date.start) / nut.date.timeScale --and divide it by the timescale, we get the minutes elapsed to add to the date start
function nut.date.get()
local realTime = RealTime()

return nut.date.dateObj:copy():addminutes(minutesSinceStart)
end

--- Returns a string formatted version of a date.
function nut.date.getFormatted(format, currentDate)
return (currentDate or nut.date.get()):fmt(format)
end

if SERVER then
hook.Add("InitializedSchema", "nutInitializeTime", function()
nut.date.initialize()
end)
-- Add the starting time + offset + current time played.
return nut.date.start + os.time({
year = nut.config.get("year"),
month = nut.config.get("month"),
day = nut.config.get("day")
}) + (realTime - (nut.joinTime or realTime))
end

hook.Add("PlayerInitialSpawn", "nutDateSync", function(client)
nut.date.sync(client)
end)
netstream.Hook("dateSync", function(curTime, offset)
offset = offset + (CurTime() - curTime)

hook.Add("SaveData", "nutDateSave", function()
nut.date.save()
nut.date.start = offset
end)
end
Loading