Merge branch 'sp/microgames' of github.com:LoveTropics/LTMinigames in…

…to sp/microgames

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'java-library'
-    id 'net.neoforged.moddev' version '1.0.0'
+    id 'net.neoforged.moddev' version '2.0.36-beta'
 }
 
 group = 'com.lovetropics.minigames'

gradle.properties

@@ -6,7 +6,7 @@ neo_version=21.0.167
 parchment_version=2024.06.23
 registrate_version=1.3.0+50
 ltlib_version=[1.4.5,1.5)
-ltextras_version=1.3.0-release+7
+ltextras_version=1.3.0-release+11
 
 org.gradle.jvmargs=-Xmx1G
 org.gradle.daemon=true

src/generated/resources/assets/ltminigames/lang/en_ud.json

@@ -170,7 +170,14 @@
   "ltminigames.minigame.build_competition": "uoıʇıʇǝdɯoƆ pןınᗺ",
   "ltminigames.minigame.calamity": "ʎʇıɯɐןɐƆ",
   "ltminigames.minigame.chaos_block_party": "ʎʇɹɐԀ ʞɔoןᗺ soɐɥƆ",
+  "ltminigames.minigame.connect_four": "ɹnoℲ ʇɔǝuuoƆ",
+  "ltminigames.minigame.connect_four.teams_goes_next": "ʇxǝu sǝob %s ɯɐǝ⟘",
+  "ltminigames.minigame.connect_four.your_turn": "ʞɔoןq ɐ ǝɔɐןd oʇ uɹnʇ ɹnoʎ sı ʇI",
   "ltminigames.minigame.conservation_exploration": "uoıʇɐɹoןdxƎ uoıʇɐʌɹǝsuoƆ",
+  "ltminigames.minigame.crafting_bee.dont_cheat": "¡ʇɐǝɥɔ ʇ,uoᗡ",
+  "ltminigames.minigame.crafting_bee.hint": "sʇuǝıpǝɹbuı ɟo ɹǝqɯnu ɯopuɐɹ ɐ ɟo uoıʇısod ǝɥʇ buıʎɐןdsıp 'ʇuıɥ ɐ ʍoɥs oʇ ʞɔıןƆ",
+  "ltminigames.minigame.crafting_bee.hints_left": "ʇɟǝן sʇuıɥ %s ǝʌɐɥ noʎ",
+  "ltminigames.minigame.crafting_bee.team_has_completed_recipes": "sǝdıɔǝɹ %s ɟo ʇno %s pǝʇǝןdɯoɔ sɐɥ %s ɯɐǝ⟘",
   "ltminigames.minigame.donation.acid_rain": "uıɐᴚ pıɔⱯ",
   "ltminigames.minigame.donation.acid_rain.description": "¡ǝʇnuıɯ Ɩ ɹoɟ spɐǝɥ ,sɹǝʎɐןd ǝɥʇ uo uʍop pıɔɐ uıɐᴚ",
   "ltminigames.minigame.donation.acid_rain.toast": "¡ǝʇnuıɯ Ɩ ɹoɟ pıɔɐ buıuıɐɹ sı ʇI",
@@ -388,6 +395,8 @@
   "ltminigames.minigame.results": ":sʇןnsǝɹ ǝɥʇ ǝɹɐ ǝɹǝH ¡ɹǝʌo sı ǝɯɐb ǝɥ⟘",
   "ltminigames.minigame.reward_item": "%s x%s - ",
   "ltminigames.minigame.rewards_granted": "¡sǝɯɐbıuıɯ buıʎɐןd ɹoɟ spɹɐʍǝɹ ʇob noʎ",
+  "ltminigames.minigame.river_race": "ǝɔɐᴚ ɹǝʌıᴚ",
+  "ltminigames.minigame.river_race.shop": "doɥS",
   "ltminigames.minigame.signature_run": "unᴚ ǝɹnʇɐubıS",
   "ltminigames.minigame.spectating_notification": "˙ɯooz oʇ ןןoɹɔs puɐ %s pןoH\n˙sɹǝʎɐןd ʇɔǝןǝs oʇ sʎǝʞ ʍoɹɹɐ ǝɥʇ ǝsn ɹo ןןoɹɔS\n¡%s ɐ ǝɹɐ noʎ",
   "ltminigames.minigame.spectating_notification.key": "ןoɹʇuoƆ ʇɟǝꞀ",
@@ -471,6 +480,7 @@
   "ltminigames.minigame.survive_the_tide_intro5": "¡ǝǝs s,ʇǝꞀ\n",
   "ltminigames.minigame.survive_the_tide_pvp_enabled.subtitle": "˙˙˙sɹǝʎɐןd ɹǝɥʇo ɟo ǝɹɐʍǝᗺ",
   "ltminigames.minigame.survive_the_tide_pvp_enabled.title": "¡ᗡƎꞀᗺⱯNƎ SI ԀΛԀ",
+  "ltminigames.minigame.team_won": "¡ǝɯɐb ǝɥʇ uoʍ %s ɯɐǝ⟘ ⭐",
   "ltminigames.minigame.teams.blue": "ǝnןᗺ",
   "ltminigames.minigame.teams.green": "uǝǝɹ⅁",
   "ltminigames.minigame.teams.hiders": "sɹǝpıH",

src/generated/resources/testing/data/lttest/games/action_trigger_test/events.json

@@ -19,6 +19,7 @@
       }
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/action_trigger_test/start.json

@@ -20,6 +20,7 @@
       "volume": 0.5
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/action_trigger_test/stop.json

@@ -16,6 +16,7 @@
       }
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/tweak_tests/cancel_damage.json

@@ -5,6 +5,7 @@
       "type": "ltminigames:cancel_player_damage"
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/tweak_tests/disable_hunger.json

@@ -5,6 +5,7 @@
       "type": "ltminigames:disable_hunger"
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/tweak_tests/max_health.json

@@ -12,6 +12,7 @@
       }
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/generated/resources/testing/data/lttest/games/tweak_tests/scale_damage.json

@@ -12,6 +12,7 @@
       }
     }
   ],
+  "is_multi_game": false,
   "map": {
     "type": "ltminigames:inline",
     "dimension": "minecraft:overworld"

src/main/java/com/lovetropics/minigames/LoveTropics.java

@@ -16,10 +16,15 @@
 import com.lovetropics.minigames.common.content.block_party.BlockParty;
 import com.lovetropics.minigames.common.content.block_party.BlockPartyTexts;
 import com.lovetropics.minigames.common.content.build_competition.BuildCompetition;
+import com.lovetropics.minigames.common.content.connect4.ConnectFour;
+import com.lovetropics.minigames.common.content.connect4.ConnectFourTexts;
+import com.lovetropics.minigames.common.content.crafting_bee.CraftingBee;
+import com.lovetropics.minigames.common.content.crafting_bee.CraftingBeeTexts;
 import com.lovetropics.minigames.common.content.hide_and_seek.HideAndSeek;
 import com.lovetropics.minigames.common.content.qottott.Qottott;
 import com.lovetropics.minigames.common.content.qottott.QottottTexts;
 import com.lovetropics.minigames.common.content.river_race.RiverRace;
+import com.lovetropics.minigames.common.content.river_race.RiverRaceTexts;
 import com.lovetropics.minigames.common.content.spleef.Spleef;
 import com.lovetropics.minigames.common.content.survive_the_tide.SurviveTheTide;
 import com.lovetropics.minigames.common.content.survive_the_tide.SurviveTheTideTexts;
@@ -118,10 +123,13 @@ public LoveTropics(IEventBus modBus, ModContainer modContainer) {
                     MinigameTexts.KEYS.forEach(consumer);
                     BiodiversityBlitzTexts.collectTranslations(consumer);
                     BlockPartyTexts.KEYS.forEach(consumer);
+                    CraftingBeeTexts.KEYS.forEach(consumer);
+                    ConnectFourTexts.KEYS.forEach(consumer);
                     SurviveTheTideTexts.KEYS.forEach(consumer);
                     TrashDiveTexts.KEYS.forEach(consumer);
                     TurtleRaceTexts.KEYS.forEach(consumer);
                     QottottTexts.KEYS.forEach(consumer);
+                    RiverRaceTexts.collectTranslations(consumer);
                 })
                 .generic(TAB_ID.getPath(), Registries.CREATIVE_MODE_TAB, () -> CreativeModeTab.builder()
                         .title(registrate().addLang("itemGroup", TAB_ID, "LTMinigames"))
@@ -145,6 +153,8 @@ public LoveTropics(IEventBus modBus, ModContainer modContainer) {
         SurviveTheTide.init();
         TrashDive.init();
         BlockParty.init();
+        CraftingBee.init();
+        ConnectFour.init();
         TurtleRace.init();
         Qottott.init();
         Spleef.init();