From 55971c21bb85065487305f03e1bedda69b196b2b Mon Sep 17 00:00:00 2001 From: Tides Date: Thu, 18 Jan 2024 12:58:47 -0500 Subject: [PATCH] Update BlocksGenerator.BlockStateBuilder.cs --- .../Registry/BlocksGenerator.BlockStateBuilder.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Obsidian.SourceGenerators/Registry/BlocksGenerator.BlockStateBuilder.cs b/Obsidian.SourceGenerators/Registry/BlocksGenerator.BlockStateBuilder.cs index 242988537..6a24682ab 100644 --- a/Obsidian.SourceGenerators/Registry/BlocksGenerator.BlockStateBuilder.cs +++ b/Obsidian.SourceGenerators/Registry/BlocksGenerator.BlockStateBuilder.cs @@ -21,13 +21,13 @@ private static void GenerateValueStore(CodeBuilder stateBuilder, BlockProperty[] private static void GeneratePossibleStates(CodeBuilder stateBuilder, Dictionary> stateValues, BlockProperty[] properties) { - stateBuilder.Indent().Append("private int[] stateIds = ["); + stateBuilder.Indent().Append("private static ReadOnlySpan StateIds => ["); foreach (var key in stateValues.Keys) stateBuilder.Append($"{key},"); stateBuilder.Append("];").Line(); - stateBuilder.Indent().Append("private int[][] stateIndexes = ["); + stateBuilder.Indent().Append("private static int[][] StatePropertyIndexes => ["); foreach (var values in stateValues.Values) { @@ -73,10 +73,10 @@ private static void SetStateFromIdMethod(string fullName, CodeBuilder stateBuild { stateBuilder.Line().Line().Method($"public {fullName}(int currentStateId)"); - stateBuilder.Line("var arrayIndex = Array.IndexOf(stateIds, currentStateId);"); - stateBuilder.Line("var stateIndexes = this.stateIndexes[arrayIndex];"); + stateBuilder.Line("var arrayIndex = StateIds.IndexOf(currentStateId);"); + stateBuilder.Line("var stateIndexesResult = StatePropertyIndexes[arrayIndex];"); - stateBuilder.Line("var values = stateIndexes.GetStateValues(this.valueStore);"); + stateBuilder.Line("var values = stateIndexesResult.GetStateValues(this.valueStore);"); var count = 0; foreach (var property in properties) @@ -214,8 +214,8 @@ private static void BuildStateFinder(CodeBuilder stateBuilder, BlockProperty[] p stateBuilder.Line("];"); - stateBuilder.Line().Line($"var stateIndex = this.stateIndexes.GetIndexFromJaggedArray(rawValue);"); + stateBuilder.Line().Line($"var stateIndex = StatePropertyIndexes.GetIndexFromJaggedArray(rawValue);"); - stateBuilder.Line().Line($"var stateId = this.stateIds[stateIndex];"); + stateBuilder.Line().Line($"var stateId = StateIds[stateIndex];"); } }