Skip to content

Commit c31ede0

Browse files
committed
update mod compatibility list & rewriters for final 1.6.0 release
1 parent 57f1106 commit c31ede0

4 files changed

Lines changed: 83 additions & 3 deletions

File tree

src/SMAPI.Web/wwwroot/SMAPI.metadata.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,11 @@
190190
"~2.0.0-6 | Status": "AssumeBroken",
191191
"~2.0.0-6 | StatusReasonDetails": "asset edits fail at runtime"
192192
},
193+
"Betwitched": {
194+
"ID": "b_wandert.Betwitched",
195+
"~0.9.0 | Status": "AssumeBroken",
196+
"~0.9.0 | StatusReasonDetails": "breaks loading the Forest location"
197+
},
193198
"Bulk Animal Purchase": {
194199
"ID": "aedenthorn.BulkAnimalPurchase",
195200
"~1.1.2 | Status": "AssumeBroken",
@@ -250,11 +255,26 @@
250255
"~1.0.0 | Status": "AssumeBroken",
251256
"~1.0.0 | StatusReasonDetails": "causes runtime crash"
252257
},
258+
"Farmageddon": {
259+
"ID": "maxvollmer.farmageddon",
260+
"~3.0.0 | Status": "AssumeBroken",
261+
"~3.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
262+
},
253263
"Fast Loads": {
254264
"ID": "spajus.fastloads",
255265
"~1.0.3 | Status": "AssumeBroken",
256266
"~1.0.3 | StatusReasonDetails": "Harmony patches fail at runtime"
257267
},
268+
"Fish Exclusions": {
269+
"ID": "GZhynko.FishExclusions",
270+
"~1.1.5 | Status": "AssumeBroken",
271+
"~1.1.5 | StatusReasonDetails": "Harmony patches fail at runtime"
272+
},
273+
"Fishing Progression": {
274+
"ID": "chadlymasterson.fishingprogression",
275+
"~1.0.1 | Status": "AssumeBroken",
276+
"~1.0.1 | StatusReasonDetails": "Harmony patches fail at runtime"
277+
},
258278
"Fixed Weapons Damage": {
259279
"ID": "BlueSight.FixedWeaponsDamage",
260280
"~1.0.0 | Status": "AssumeBroken",
@@ -280,11 +300,21 @@
280300
"~1.0.0 | Status": "AssumeBroken",
281301
"~1.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
282302
},
303+
"Hugs and Kisses": {
304+
"ID": "aedenthorn.HugsAndKisses",
305+
"~0.4.0 | Status": "AssumeBroken",
306+
"~0.4.0 | StatusReasonDetails": "Harmony patches fail at runtime"
307+
},
283308
"Mayo Hats": {
284309
"ID": "spacechase0.MayoHats",
285310
"~1.0.0 | Status": "AssumeBroken",
286311
"~1.0.0 | StatusReasonDetails": "affected by breaking changes in the Json Assets mod API"
287312
},
313+
"Mayo Mart": {
314+
"ID": "aedenthorn.MayoMart",
315+
"~0.1.0 | Status": "AssumeBroken",
316+
"~0.1.0 | StatusReasonDetails": "Harmony patches fail at runtime"
317+
},
288318
"Misophonia Accessibility": {
289319
"ID": "TheFluffyRobot.MisophoniaAccessibility",
290320
"~3.0.1 | Status": "AssumeBroken",
@@ -340,6 +370,11 @@
340370
"~2.1.0 | Status": "AssumeBroken",
341371
"~2.1.0 | StatusReasonDetails": "Harmony patches fail at runtime"
342372
},
373+
"Ore Increaser": {
374+
"ID": "crazywig.oreincrease",
375+
"~1.0.0 | Status": "AssumeBroken",
376+
"~1.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
377+
},
343378
"Ore Increase V3": {
344379
"ID": "OreIncreaseV3",
345380
"~3.0.0 | Status": "AssumeBroken",
@@ -460,6 +495,11 @@
460495
"~1.0.1-alpha | Status": "AssumeBroken",
461496
"~1.0.1-alpha | StatusReasonDetails": "Harmony patches fail at runtime"
462497
},
498+
"The Adventurer's Life Expanded": {
499+
"ID": "HamioDracny.TALE.SMAPI",
500+
"~1.2.1 | Status": "AssumeBroken",
501+
"~1.2.1 | StatusReasonDetails": "Harmony patches fail at runtime"
502+
},
463503
"This Mod Is Organic": {
464504
"ID": "SweetPanda.Organic",
465505
"~1.0.0 | Status": "AssumeBroken",

src/SMAPI/Framework/ModLoading/Rewriters/StardewValley_1_6/FishingRodFacade.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
using System;
2+
using System.Collections.Generic;
13
using System.Diagnostics.CodeAnalysis;
24
using StardewModdingAPI.Framework.ModLoading.Framework;
35
using StardewValley.Tools;
6+
using SObject = StardewValley.Object;
47

58
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member: This is internal code to support rewriters and shouldn't be called directly.
69

@@ -15,6 +18,16 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters.StardewValley_1_6
1518
[SuppressMessage("ReSharper", "UnusedMember.Global", Justification = SuppressReasons.UsedViaRewriting)]
1619
public class FishingRodFacade : FishingRod, IRewriteFacade
1720
{
21+
/*********
22+
** Accessors
23+
*********/
24+
public bool caughtDoubleFish
25+
{
26+
get => base.numberOfFishCaught > 1;
27+
set => base.numberOfFishCaught = value ? Math.Max(2, base.numberOfFishCaught) : 1;
28+
}
29+
30+
1831
/*********
1932
** Public methods
2033
*********/
@@ -27,14 +40,16 @@ public int getBaitAttachmentIndex()
2740

2841
public int getBobberAttachmentIndex()
2942
{
30-
return int.TryParse(base.GetTackle()?.ItemId, out int index)
43+
List<SObject>? tackle = base.GetTackle();
44+
45+
return tackle?.Count > 0 && int.TryParse(tackle[0]?.ItemId, out int index)
3146
? index
3247
: -1;
3348
}
3449

3550
public void pullFishFromWater(int whichFish, int fishSize, int fishQuality, int fishDifficulty, bool treasureCaught, bool wasPerfect, bool fromFishPond, bool caughtDouble = false, string itemCategory = "Object")
3651
{
37-
base.pullFishFromWater(whichFish.ToString(), fishSize, fishQuality, fishDifficulty, treasureCaught, wasPerfect, fromFishPond, null, false, caughtDouble);
52+
base.pullFishFromWater(whichFish.ToString(), fishSize, fishQuality, fishDifficulty, treasureCaught, wasPerfect, fromFishPond, null, false, caughtDouble ? 2 : 1);
3853
}
3954

4055

src/SMAPI/Framework/ModLoading/Rewriters/StardewValley_1_6/Game1Facade.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,37 @@ public static NPC getCharacterFromName(string name, bool mustBeVillager = true,
121121
return Game1.getCharacterFromName(name, mustBeVillager);
122122
}
123123

124+
public static int getModeratelyDarkTime()
125+
{
126+
return Game1.getModeratelyDarkTime(Game1.currentLocation);
127+
}
128+
124129
public new static string GetSeasonForLocation(GameLocation location)
125130
{
126131
Season season = Game1.GetSeasonForLocation(location);
127132
return season.ToString();
128133
}
129134

135+
public static int getStartingToGetDarkTime()
136+
{
137+
return Game1.getStartingToGetDarkTime(Game1.currentLocation);
138+
}
139+
140+
public static int getTrulyDarkTime()
141+
{
142+
return Game1.getTrulyDarkTime(Game1.currentLocation);
143+
}
144+
145+
public static bool isDarkOut()
146+
{
147+
return Game1.isDarkOut(Game1.currentLocation);
148+
}
149+
150+
public static bool isStartingToGetDarkOut()
151+
{
152+
return Game1.isStartingToGetDarkOut(Game1.currentLocation);
153+
}
154+
130155
public static void playMorningSong()
131156
{
132157
Game1.playMorningSong();

src/SMAPI/Framework/ModLoading/Rewriters/StardewValley_1_6/ObjectFacade.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void DayUpdate(GameLocation location)
7474

7575
public void farmerAdjacentAction(GameLocation location)
7676
{
77-
base.farmerAdjacentAction();
77+
base.farmerAdjacentAction(Game1.player);
7878
}
7979

8080
public Rectangle getBoundingBox(Vector2 tileLocation)

0 commit comments

Comments
 (0)