From e00467b88619e490695622860ec1cd789171efd4 Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:08:48 +0200 Subject: [PATCH 1/6] Add IDEA copyright configs This will have to do since global copyright profiles are still not available: https://youtrack.jetbrains.com/issue/IDEA-136468 --- .idea/copyright/GPL.xml | 7 +++++++ .idea/copyright/profiles_settings.xml | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100644 .idea/copyright/GPL.xml create mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/copyright/GPL.xml b/.idea/copyright/GPL.xml new file mode 100644 index 0000000..2db906b --- /dev/null +++ b/.idea/copyright/GPL.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..fb4a5c7 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file From 2131a59663f17c34fb8da1599948a860276b6e54 Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:09:51 +0200 Subject: [PATCH 2/6] Add license notices Resolves #17 --- src/main/java/io/yooksi/daylight/DTLogger.java | 13 +++++++++++++ src/main/java/io/yooksi/daylight/Daylight.java | 13 +++++++++++++ .../io/yooksi/daylight/config/ClientConfig.java | 13 +++++++++++++ .../io/yooksi/daylight/config/DaylightConfig.java | 13 +++++++++++++ .../java/io/yooksi/daylight/gui/GuiHandler.java | 13 +++++++++++++ src/main/java/io/yooksi/daylight/gui/TimeCycle.java | 13 +++++++++++++ .../java/io/yooksi/daylight/gui/TimeSegment.java | 13 +++++++++++++ 7 files changed, 91 insertions(+) diff --git a/src/main/java/io/yooksi/daylight/DTLogger.java b/src/main/java/io/yooksi/daylight/DTLogger.java index 0da8392..c1a4522 100644 --- a/src/main/java/io/yooksi/daylight/DTLogger.java +++ b/src/main/java/io/yooksi/daylight/DTLogger.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight; import org.apache.logging.log4j.Level; diff --git a/src/main/java/io/yooksi/daylight/Daylight.java b/src/main/java/io/yooksi/daylight/Daylight.java index d16f349..2307aa1 100644 --- a/src/main/java/io/yooksi/daylight/Daylight.java +++ b/src/main/java/io/yooksi/daylight/Daylight.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight; import io.yooksi.daylight.config.DaylightConfig; diff --git a/src/main/java/io/yooksi/daylight/config/ClientConfig.java b/src/main/java/io/yooksi/daylight/config/ClientConfig.java index f82db55..b340d61 100644 --- a/src/main/java/io/yooksi/daylight/config/ClientConfig.java +++ b/src/main/java/io/yooksi/daylight/config/ClientConfig.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight.config; import io.yooksi.cocolib.gui.Alignment; diff --git a/src/main/java/io/yooksi/daylight/config/DaylightConfig.java b/src/main/java/io/yooksi/daylight/config/DaylightConfig.java index 0668e11..1395829 100644 --- a/src/main/java/io/yooksi/daylight/config/DaylightConfig.java +++ b/src/main/java/io/yooksi/daylight/config/DaylightConfig.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight.config; import io.yooksi.cocolib.gui.Alignment; diff --git a/src/main/java/io/yooksi/daylight/gui/GuiHandler.java b/src/main/java/io/yooksi/daylight/gui/GuiHandler.java index b0c47ce..df6b7c6 100644 --- a/src/main/java/io/yooksi/daylight/gui/GuiHandler.java +++ b/src/main/java/io/yooksi/daylight/gui/GuiHandler.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight.gui; import net.minecraft.client.Minecraft; diff --git a/src/main/java/io/yooksi/daylight/gui/TimeCycle.java b/src/main/java/io/yooksi/daylight/gui/TimeCycle.java index 07f7fee..183d5ea 100644 --- a/src/main/java/io/yooksi/daylight/gui/TimeCycle.java +++ b/src/main/java/io/yooksi/daylight/gui/TimeCycle.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight.gui; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/io/yooksi/daylight/gui/TimeSegment.java b/src/main/java/io/yooksi/daylight/gui/TimeSegment.java index 0a6dde8..52c08be 100644 --- a/src/main/java/io/yooksi/daylight/gui/TimeSegment.java +++ b/src/main/java/io/yooksi/daylight/gui/TimeSegment.java @@ -1,3 +1,16 @@ +/* + * Copyright (C) 2020 Matthew Cain + * + * This file is part of Daylight. + * + * Daylight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License + * along with Daylight. If not, see . + */ package io.yooksi.daylight.gui; import io.yooksi.cocolib.gui.PlaneGeometry; From 0e7583ea8ea011c8092898230248e67d7445fe72 Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:25:04 +0200 Subject: [PATCH 3/6] Declare mod dependencies Resolves #19 --- src/main/resources/META-INF/mods.toml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 657b434..72b74ec 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -22,3 +22,24 @@ credits="Thanks to Java and Forge team" authors="yooksi" # The description text for the mod (multi line!) description='''Helps you keep track of day time.''' + +[[dependencies.daylight]] + modId="forge" + mandatory=true + versionRange="[31.2.0,)" + ordering="NONE" + side="BOTH" + +[[dependencies.daylight]] + modId="minecraft" + mandatory=true + versionRange="[1.15.2]" + ordering="NONE" + side="BOTH" + +[[dependencies.daylight]] + modId="cocolib" + mandatory=true + versionRange="[0.1,)" + ordering="BEFORE" + side="BOTH" From d5c39a279d056571422a6e0d13f320bbc38bfdcf Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:26:43 +0200 Subject: [PATCH 4/6] Add @amazingcoco as author --- src/main/resources/META-INF/mods.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 72b74ec..ec0bc39 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ displayURL="https://github.com/yooksi/Daylight" # A text field displayed in the mod UI credits="Thanks to Java and Forge team" # A text field displayed in the mod UI -authors="yooksi" +authors="yooksi & Coco" # The description text for the mod (multi line!) description='''Helps you keep track of day time.''' From 750ee446b3accb0ec2e3798d51d3809e820766a2 Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:27:04 +0200 Subject: [PATCH 5/6] Bump forge version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a2fe578..3d98018 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ modVersion=0.1.0 groupName=yooksi minecraftVersion=1.15.2 -forgeVersion=31.1.63 +forgeVersion=31.2.0 mappingMCVersion=1.15.1 mappingBuild=20200501 From 3bac09d54ef1b8ce9834229e049cd46a6aded716 Mon Sep 17 00:00:00 2001 From: Matthew Cain Date: Tue, 19 May 2020 05:27:12 +0200 Subject: [PATCH 6/6] Bump mod version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3d98018..9a4cb0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false modId=daylight -modVersion=0.1.0 +modVersion=0.1.1 groupName=yooksi minecraftVersion=1.15.2