Skip to content

Commit 6000f92

Browse files
committed
Beta 1.19
- Removed `chat_message` event (added in Carpet) - Removed unused parameters in config `sctwitch.json` - Added TSL compatibility (ALPHA - many actions don't work, default false)
1 parent 48c8f7f commit 6000f92

23 files changed

+735
-469
lines changed

build.gradle

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '0.8-SNAPSHOT'
2+
id 'fabric-loom' version '0.11-SNAPSHOT'
33
id 'maven-publish'
44
id "com.github.johnrengelman.shadow" version "6.0.0"
55
}
@@ -10,17 +10,18 @@ repositories {
1010
}
1111
}
1212

13-
sourceCompatibility = JavaVersion.VERSION_16
14-
targetCompatibility = JavaVersion.VERSION_16
13+
sourceCompatibility = JavaVersion.VERSION_17
14+
targetCompatibility = JavaVersion.VERSION_17
1515

1616
archivesBaseName = project.archives_base_name
17-
version = project.mod_version
17+
version = project.minecraft_version+'-'+project.mod_version
1818
group = project.maven_group
1919

20-
minecraft {
20+
loom {
2121
}
2222

2323
dependencies {
24+
//to change the versions see the gradle.properties file
2425
minecraft "com.mojang:minecraft:${project.minecraft_version}"
2526
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
2627
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
@@ -50,6 +51,8 @@ processResources {
5051
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
5152
tasks.withType(JavaCompile) {
5253
options.encoding = "UTF-8"
54+
55+
it.options.release = 17
5356
}
5457

5558
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
@@ -60,6 +63,13 @@ task sourcesJar(type: Jar, dependsOn: classes) {
6063
from sourceSets.main.allSource
6164
}
6265

66+
java {
67+
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
68+
// if it is present.
69+
// If you remove this line, sources will not be generated.
70+
withSourcesJar()
71+
}
72+
6373
jar {
6474
from "LICENSE"
6575
}
@@ -69,10 +79,7 @@ publishing {
6979
publications {
7080
mavenJava(MavenPublication) {
7181
// add all the jars that should be included when publishing to maven
72-
artifact(jar) {
73-
builtBy remapJar
74-
}
75-
artifact("${project.buildDir.absolutePath}/libs/${archivesBaseName}-${project.minecraft_version}-${project.version}.jar"){
82+
artifact(remapJar) {
7683
builtBy remapJar
7784
}
7885
artifact(sourcesJar) {

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
org.gradle.jvmargs = -Xmx1G
22

33
#Fabric properties
4-
minecraft_version=1.17.1
5-
yarn_mappings=1.17.1+build.39
6-
loader_version=0.12.12
7-
carpet_core_version=1.4.57+v220119
4+
minecraft_version=22w13a
5+
yarn_mappings=22w13a+build.2
6+
loader_version=0.13.3
7+
carpet_core_version=1.4.69+v220331
88

99
#Mod properties
10-
mod_version = 1.4.57
10+
mod_version = 1.4.69
1111
maven_group = it.multicoredev.sti
1212
archives_base_name = sctwitch
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/de/replaceitem/discarpet/EventInteface.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/main/java/de/replaceitem/discarpet/ScarpetEvents.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/main/java/de/replaceitem/discarpet/mixins/CarpetEvent_Mixin.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/de/replaceitem/discarpet/mixins/MinecraftChat_Mixin.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/it/multicoredev/sti/ScTwitch.java

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,23 @@
2525
import java.nio.charset.StandardCharsets;
2626
import java.nio.file.Files;
2727
import java.nio.file.Path;
28-
import java.util.HashMap;
29-
import java.util.Locale;
30-
import java.util.Map;
28+
import java.util.*;
3129

3230
public class ScTwitch implements CarpetExtension, ModInitializer {
3331
public static final String MOD_ID = "sctwitch";
3432
public static final String MOD_NAME = "ScTwitch";
35-
public static final String MOD_VERSION = "1.4.57";
33+
public static final String MOD_VERSION = "1.4.69";
3634
public static final boolean DEBUG = true;
3735

3836
static {
3937
CarpetServer.manageExtension(new ScTwitch());
4038
CarpetScriptServer.registerBuiltInScript(sctwitchDefaultScript("sctwitch_event_test", false));
41-
CarpetScriptServer.registerBuiltInScript(sctwitchDefaultScript("chat_message_event_test", false));
42-
CarpetScriptServer.registerSettingsApp(sctwitchDefaultScript("sapling", false));
43-
CarpetScriptServer.registerSettingsApp(sctwitchDefaultScript("snowman", false));
39+
CarpetScriptServer.registerSettingsApp(sctwitchDefaultScript("twitchspawn", false));
4440
}
4541

46-
public static Map<String, StreamlabsSocket> streamlabsSockets = new HashMap<>();
47-
public static Map<String, StreamelementsSocket> streamelementsSockets = new HashMap<>();
48-
public static Map<String, TwitchChatSocket> twitchChatSockets = new HashMap<>();
42+
public static List<StreamlabsSocket> streamlabsSockets = new ArrayList<>();
43+
public static List<StreamelementsSocket> streamelementsSockets = new ArrayList<>();
44+
public static List<TwitchChatSocket> twitchChatSockets = new ArrayList<>();
4945

5046
public static BundledModule sctwitchDefaultScript(String scriptName, boolean isLibrary) {
5147
BundledModule module = new BundledModule(scriptName.toLowerCase(Locale.ROOT), null, false);
@@ -72,26 +68,31 @@ public void createSockets() {
7268
System.out.println("File di config loaded from " + configFile);
7369
Config.getInstance().toFile(configFile.toFile());
7470
for (StreamerConfig s : Config.getInstance().STREAMERS) {
75-
streamelementsSockets.put(s.STREAMLABS_ACCOUNT, new StreamelementsSocket(s.STREAMELEMENTS_SECRET_TOKEN, new StreamelementsEventHandler(s.MINECRAFT_ACCOUNT)));
76-
streamlabsSockets.put(s.STREAMLABS_ACCOUNT, new StreamlabsSocket(s.STREAMLABS_SECRET_TOKEN, new StreamlabsEventHandler(s.MINECRAFT_ACCOUNT)));
77-
twitchChatSockets.put(s.STREAMLABS_ACCOUNT, new TwitchChatSocket(s.TWITCH_ACCOUNT, s.TWITCH_CHAT_TOKEN, new TwitchEventHandler(s.MINECRAFT_ACCOUNT)));
78-
System.out.println("Collegamento a " + s.STREAMLABS_ACCOUNT + " avvenuto con successo.");
71+
streamelementsSockets.add(new StreamelementsSocket(s.STREAMELEMENTS_SECRET_TOKEN, new StreamelementsEventHandler(s.MINECRAFT_ACCOUNT)));
72+
streamlabsSockets.add(new StreamlabsSocket(s.STREAMLABS_SECRET_TOKEN, new StreamlabsEventHandler(s.MINECRAFT_ACCOUNT)));
73+
twitchChatSockets.add(new TwitchChatSocket(s.TWITCH_ACCOUNT, s.TWITCH_CHAT_TOKEN, new TwitchEventHandler(s.MINECRAFT_ACCOUNT)));
74+
System.out.println("Collegamento a " + s.TWITCH_ACCOUNT + " avvenuto con successo.");
7975
}
8076
} catch (IOException e) {
8177
e.printStackTrace();
8278
}
8379
}
8480

8581
public void startSockets() {
86-
streamelementsSockets.forEach((streamer, socket) -> socket.start());
87-
streamlabsSockets.forEach((streamer, socket) -> socket.start());
88-
twitchChatSockets.forEach((streamer, socket) -> socket.start());
82+
streamelementsSockets.forEach(StreamelementsSocket::start);
83+
streamlabsSockets.forEach(StreamlabsSocket::start);
84+
twitchChatSockets.forEach(TwitchChatSocket::start);
8985
}
9086

9187
public void stopSockets() {
92-
streamelementsSockets.forEach((streamer, socket) -> socket.stop());
93-
streamlabsSockets.forEach((streamer, socket) -> socket.stop());
94-
twitchChatSockets.forEach((streamer, socket) -> socket.stop());
88+
streamelementsSockets.forEach(StreamelementsSocket::stop);
89+
streamlabsSockets.forEach(StreamlabsSocket::stop);
90+
twitchChatSockets.forEach(TwitchChatSocket::stop);
91+
}
92+
93+
@Override
94+
public void onServerLoadedWorlds(MinecraftServer server) {
95+
onReload(server);
9596
}
9697

9798
@Override

src/main/java/it/multicoredev/sti/ScTwitchSettings.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,9 @@
66

77
public class ScTwitchSettings {
88
@Rule(
9-
desc = "Ogni volta che un utente lascerà un sub/follow, ti verrà dato un albero.",
10-
appSource = "sapling",
9+
desc = "Adds twitchspawn file compatibility.",
10+
appSource = "twitchspawn",
1111
category = {EXPERIMENTAL}
1212
)
13-
public static boolean sctwitchSapling = false;
14-
@Rule(
15-
desc = "Ogni volta che un utente lascerà un follow, verrà evocato un golem di neve.",
16-
appSource = "snowman",
17-
category = {EXPERIMENTAL}
18-
)
19-
public static boolean sctwitchSnowman = false;
13+
public static boolean twitchSpawn = false;
2014
}

src/main/java/it/multicoredev/sti/config/Config.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ public Config() {
3131
this.STREAMERS = new ArrayList<>();
3232
this.STREAMERS.add(
3333
new StreamerConfig(
34-
"Your Streamlabs Name",
35-
"Your Streamelements Name",
3634
"Your Twitch Name",
3735
"Your YouTube Name",
3836
"Your Minecraft Nickname",
@@ -66,8 +64,7 @@ public static void load(String file) {
6664
}
6765

6866
private static Config fromDefaults() {
69-
Config config = new Config();
70-
return config;
67+
return new Config();
7168
}
7269

7370
public void toFile(String file) {

0 commit comments

Comments
 (0)