First Machine Age's Mods (Combined repo.)
| リビジョン | c6cf34919cf235a68cd6ca6e845e4b9dd8b5c918 (tree) |
|---|---|
| 日時 | 2021-05-04 11:40:15 |
| 作者 |  melchior <melchior@user...> |
| コミッター | melchior |
probably Fixed Harmony method duplication, asst.
improvments
AnvilMetalRecovery/Harmony/AnvilDaptor.cs (diff)| @@ -1,5 +1,6 @@ | ||
| 1 | 1 | using System; |
| 2 | 2 | using System.Linq; |
| 3 | +using System.Reflection; | |
| 3 | 4 | using System.Text; |
| 4 | 5 | |
| 5 | 6 | using HarmonyLib; |
| @@ -9,7 +10,7 @@ using Vintagestory.API.Config; | ||
| 9 | 10 | using Vintagestory.API.MathTools; |
| 10 | 11 | using Vintagestory.GameContent; |
| 11 | 12 | |
| 12 | -namespace AnvilMetalRecovery | |
| 13 | +namespace AnvilMetalRecovery.Patches | |
| 13 | 14 | { |
| 14 | 15 | /// <summary> |
| 15 | 16 | /// Harmony patcher class to wrap B.E. Anvil class |
| @@ -17,7 +18,21 @@ namespace AnvilMetalRecovery | ||
| 17 | 18 | [HarmonyPatch(typeof(BlockEntityAnvil))] |
| 18 | 19 | public class AnvilDaptor |
| 19 | 20 | { |
| 20 | - | |
| 21 | + | |
| 22 | + [HarmonyPrepare] | |
| 23 | + private static bool DeduplicatePatching(MethodBase original, Harmony harmony) | |
| 24 | + { | |
| 25 | + | |
| 26 | + if (original != null ) { | |
| 27 | + foreach(var patched in harmony.GetPatchedMethods()) | |
| 28 | + { | |
| 29 | + if (patched.Name == original.Name)return false; //SKIPS PATCHING, its already there | |
| 30 | + } | |
| 31 | + } | |
| 32 | + | |
| 33 | + return true;//patch all other methods | |
| 34 | + } | |
| 35 | + | |
| 21 | 36 | [HarmonyPrefix] |
| 22 | 37 | [HarmonyPatch(nameof(BlockEntityAnvil.OnSplit))] |
| 23 | 38 | private static void Prefix_OnSplit(Vec3i voxelPos, BlockEntityAnvil __instance) |
| @@ -44,15 +59,14 @@ namespace AnvilMetalRecovery | ||
| 44 | 59 | } |
| 45 | 60 | |
| 46 | 61 | [HarmonyPostfix] |
| 47 | - [HarmonyPatch(nameof(BlockEntityAnvil.GetBlockInfo))] | |
| 62 | + [HarmonyPatch(nameof(BlockEntityAnvil.GetBlockInfo))] | |
| 48 | 63 | private static void Postfix_GetBlockInfo(IPlayer forPlayer, StringBuilder dsc, BlockEntityAnvil __instance) |
| 49 | - { | |
| 50 | - if (__instance.Api.Side.IsServer()) return; | |
| 64 | + { | |
| 51 | 65 | var anvil = new SmithAssist(__instance); |
| 52 | 66 | |
| 53 | 67 | if (anvil.BaseMaterial != null && anvil.IsShavable && anvil.SplitCount > 0) |
| 54 | - { | |
| 55 | - dsc.AppendFormat("[ {0} ÷ {1} ] : {2}\n", anvil.SplitCount, SmithAssist.shavingValue, Lang.GetUnformatted($"fma:item-metal_shaving-{anvil.BaseMetal}")); | |
| 68 | + { | |
| 69 | + dsc.AppendFormat("[ {0} ] : {1} × {2}\n", anvil.SplitCount, Lang.GetUnformatted($"fma:item-metal_shaving-{anvil.BaseMetal}"), anvil.ShavingQuantity); | |
| 56 | 70 | } |
| 57 | 71 | } |
| 58 | 72 |
| @@ -73,7 +87,7 @@ namespace AnvilMetalRecovery | ||
| 73 | 87 | private readonly BlockEntityAnvil bea; |
| 74 | 88 | |
| 75 | 89 | internal const string splitCountKey = @"splitCount"; |
| 76 | - internal const uint shavingValue = 5; | |
| 90 | + internal const int shavingValue = 5; | |
| 77 | 91 | |
| 78 | 92 | internal SmithAssist(BlockEntityAnvil a) |
| 79 | 93 | { |
| @@ -87,7 +101,7 @@ namespace AnvilMetalRecovery | ||
| 87 | 101 | } |
| 88 | 102 | } |
| 89 | 103 | |
| 90 | - internal static AssetLocation MetalShavingsCode { | |
| 104 | + public static AssetLocation MetalShavingsCode { | |
| 91 | 105 | get |
| 92 | 106 | { |
| 93 | 107 | return new AssetLocation(@"fma", @"metal_shaving"); |
| @@ -101,7 +115,7 @@ namespace AnvilMetalRecovery | ||
| 101 | 115 | } |
| 102 | 116 | |
| 103 | 117 | |
| 104 | - internal int SplitCount { | |
| 118 | + public int SplitCount { | |
| 105 | 119 | get |
| 106 | 120 | { |
| 107 | 121 | return bea.WorkItemStack?.Attributes.TryGetInt(splitCountKey) ?? 0; |
| @@ -112,7 +126,7 @@ namespace AnvilMetalRecovery | ||
| 112 | 126 | } |
| 113 | 127 | } |
| 114 | 128 | |
| 115 | - internal bool IsShavable { | |
| 129 | + public bool IsShavable { | |
| 116 | 130 | get |
| 117 | 131 | { |
| 118 | 132 | //this.SelectedRecipe <-- things that are recoverable? |
| @@ -120,6 +134,11 @@ namespace AnvilMetalRecovery | ||
| 120 | 134 | } |
| 121 | 135 | } |
| 122 | 136 | |
| 137 | + public int ShavingQuantity | |
| 138 | + { | |
| 139 | + get { return (SplitCount / shavingValue); } | |
| 140 | + } | |
| 141 | + | |
| 123 | 142 | internal IAnvilWorkable AnvilWorkpiece { |
| 124 | 143 | get |
| 125 | 144 | { |
| @@ -137,14 +156,14 @@ namespace AnvilMetalRecovery | ||
| 137 | 156 | } |
| 138 | 157 | } |
| 139 | 158 | |
| 140 | - internal string BaseMetal { | |
| 159 | + public string BaseMetal { | |
| 141 | 160 | get |
| 142 | 161 | { |
| 143 | 162 | return this?.BaseMaterial?.Collectible.LastCodePart( ); |
| 144 | 163 | } |
| 145 | 164 | } |
| 146 | 165 | |
| 147 | - internal int MetalVoxelCount { | |
| 166 | + public int MetalVoxelCount { | |
| 148 | 167 | get { return bea.Voxels.OfType<byte>( ).Count(vox => vox == (byte)EnumVoxelMaterial.Metal); } |
| 149 | 168 | } |
| 150 | 169 |
Fork