Skip to content

Commit

Permalink
update mod compatibility list & rewriters for final 1.6.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Pathoschild committed Mar 19, 2024
1 parent 57f1106 commit c31ede0
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 3 deletions.
40 changes: 40 additions & 0 deletions src/SMAPI.Web/wwwroot/SMAPI.metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@
"~2.0.0-6 | Status": "AssumeBroken",
"~2.0.0-6 | StatusReasonDetails": "asset edits fail at runtime"
},
"Betwitched": {
"ID": "b_wandert.Betwitched",
"~0.9.0 | Status": "AssumeBroken",
"~0.9.0 | StatusReasonDetails": "breaks loading the Forest location"
},
"Bulk Animal Purchase": {
"ID": "aedenthorn.BulkAnimalPurchase",
"~1.1.2 | Status": "AssumeBroken",
Expand Down Expand Up @@ -250,11 +255,26 @@
"~1.0.0 | Status": "AssumeBroken",
"~1.0.0 | StatusReasonDetails": "causes runtime crash"
},
"Farmageddon": {
"ID": "maxvollmer.farmageddon",
"~3.0.0 | Status": "AssumeBroken",
"~3.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Fast Loads": {
"ID": "spajus.fastloads",
"~1.0.3 | Status": "AssumeBroken",
"~1.0.3 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Fish Exclusions": {
"ID": "GZhynko.FishExclusions",
"~1.1.5 | Status": "AssumeBroken",
"~1.1.5 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Fishing Progression": {
"ID": "chadlymasterson.fishingprogression",
"~1.0.1 | Status": "AssumeBroken",
"~1.0.1 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Fixed Weapons Damage": {
"ID": "BlueSight.FixedWeaponsDamage",
"~1.0.0 | Status": "AssumeBroken",
Expand All @@ -280,11 +300,21 @@
"~1.0.0 | Status": "AssumeBroken",
"~1.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Hugs and Kisses": {
"ID": "aedenthorn.HugsAndKisses",
"~0.4.0 | Status": "AssumeBroken",
"~0.4.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Mayo Hats": {
"ID": "spacechase0.MayoHats",
"~1.0.0 | Status": "AssumeBroken",
"~1.0.0 | StatusReasonDetails": "affected by breaking changes in the Json Assets mod API"
},
"Mayo Mart": {
"ID": "aedenthorn.MayoMart",
"~0.1.0 | Status": "AssumeBroken",
"~0.1.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Misophonia Accessibility": {
"ID": "TheFluffyRobot.MisophoniaAccessibility",
"~3.0.1 | Status": "AssumeBroken",
Expand Down Expand Up @@ -340,6 +370,11 @@
"~2.1.0 | Status": "AssumeBroken",
"~2.1.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Ore Increaser": {
"ID": "crazywig.oreincrease",
"~1.0.0 | Status": "AssumeBroken",
"~1.0.0 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"Ore Increase V3": {
"ID": "OreIncreaseV3",
"~3.0.0 | Status": "AssumeBroken",
Expand Down Expand Up @@ -460,6 +495,11 @@
"~1.0.1-alpha | Status": "AssumeBroken",
"~1.0.1-alpha | StatusReasonDetails": "Harmony patches fail at runtime"
},
"The Adventurer's Life Expanded": {
"ID": "HamioDracny.TALE.SMAPI",
"~1.2.1 | Status": "AssumeBroken",
"~1.2.1 | StatusReasonDetails": "Harmony patches fail at runtime"
},
"This Mod Is Organic": {
"ID": "SweetPanda.Organic",
"~1.0.0 | Status": "AssumeBroken",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using StardewModdingAPI.Framework.ModLoading.Framework;
using StardewValley.Tools;
using SObject = StardewValley.Object;

#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.

Expand All @@ -15,6 +18,16 @@ namespace StardewModdingAPI.Framework.ModLoading.Rewriters.StardewValley_1_6
[SuppressMessage("ReSharper", "UnusedMember.Global", Justification = SuppressReasons.UsedViaRewriting)]
public class FishingRodFacade : FishingRod, IRewriteFacade
{
/*********
** Accessors
*********/
public bool caughtDoubleFish
{
get => base.numberOfFishCaught > 1;
set => base.numberOfFishCaught = value ? Math.Max(2, base.numberOfFishCaught) : 1;
}


/*********
** Public methods
*********/
Expand All @@ -27,14 +40,16 @@ public int getBaitAttachmentIndex()

public int getBobberAttachmentIndex()
{
return int.TryParse(base.GetTackle()?.ItemId, out int index)
List<SObject>? tackle = base.GetTackle();

return tackle?.Count > 0 && int.TryParse(tackle[0]?.ItemId, out int index)
? index
: -1;
}

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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,37 @@ public static NPC getCharacterFromName(string name, bool mustBeVillager = true,
return Game1.getCharacterFromName(name, mustBeVillager);
}

public static int getModeratelyDarkTime()
{
return Game1.getModeratelyDarkTime(Game1.currentLocation);
}

public new static string GetSeasonForLocation(GameLocation location)
{
Season season = Game1.GetSeasonForLocation(location);
return season.ToString();
}

public static int getStartingToGetDarkTime()
{
return Game1.getStartingToGetDarkTime(Game1.currentLocation);
}

public static int getTrulyDarkTime()
{
return Game1.getTrulyDarkTime(Game1.currentLocation);
}

public static bool isDarkOut()
{
return Game1.isDarkOut(Game1.currentLocation);
}

public static bool isStartingToGetDarkOut()
{
return Game1.isStartingToGetDarkOut(Game1.currentLocation);
}

public static void playMorningSong()
{
Game1.playMorningSong();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void DayUpdate(GameLocation location)

public void farmerAdjacentAction(GameLocation location)
{
base.farmerAdjacentAction();
base.farmerAdjacentAction(Game1.player);
}

public Rectangle getBoundingBox(Vector2 tileLocation)
Expand Down

0 comments on commit c31ede0

Please sign in to comment.