diff --git a/GCMC/CubePlacerEngine.cs b/GCMC/CubePlacerEngine.cs index 9011b0c..e2db938 100644 --- a/GCMC/CubePlacerEngine.cs +++ b/GCMC/CubePlacerEngine.cs @@ -85,6 +85,7 @@ namespace GCMC darkness = 5; break; case "AIR": + case "DOUBLE_PLANT": continue; case "LOG": id = BlockIDs.WoodCube; @@ -98,6 +99,24 @@ namespace GCMC id = BlockIDs.AluminiumCube; color = BlockColors.Yellow; break; + case "LONG_GRASS": + id = BlockIDs.Flower1; + color = BlockColors.Default; + break; + case "YELLOW_FLOWER": + id = BlockIDs.Flower2; + color = BlockColors.Default; + break; + case "GRAVEL": + id = BlockIDs.ConcreteCube; + color = BlockColors.White; + darkness = 7; + break; + case "CLAY": + id = BlockIDs.ConcreteCube; + color = BlockColors.White; + darkness = 4; + break; default: Console.WriteLine("Unknown block: " + blocks.Material); continue; diff --git a/GCMC/GCMC.csproj b/GCMC/GCMC.csproj index b161140..7588c54 100644 --- a/GCMC/GCMC.csproj +++ b/GCMC/GCMC.csproj @@ -21,17 +21,14 @@ ..\ref\DataLoader.dll - - ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net48\GamecraftModdingAPI.dll - - - ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net48\GamecraftModdingAPI.dll + + ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\GamecraftModdingAPI.dll IllusionPlugin.dll - - ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net48\Newtonsoft.Json.dll + + ..\..\GamecraftModdingAPI\GamecraftModdingAPI\bin\Debug\net472\Newtonsoft.Json.dll ..\ref\RobocraftX.Blocks.dll diff --git a/GCMC/PlaceBlockPatch.cs b/GCMC/PlaceBlockPatch.cs index f1e4e36..69fd431 100644 --- a/GCMC/PlaceBlockPatch.cs +++ b/GCMC/PlaceBlockPatch.cs @@ -2,7 +2,6 @@ using System.Reflection; using DataLoader; using Harmony; using JetBrains.Annotations; -using RobocraftX.Blocks.GUI; using RobocraftX.Common; using RobocraftX.CR.MachineEditing; using RobocraftX.StateSync; @@ -20,7 +19,7 @@ namespace GCMC { if (isAuthoritative) { - stateSyncReg.AddEngine(new CubePlacerEngine()); + stateSyncReg.AddDeterministicEngine(new CubePlacerEngine()); Debug.Log($"Added Minecraft world import engine"); } else @@ -29,7 +28,7 @@ namespace GCMC static MethodBase TargetMethod(HarmonyInstance instance) { - return typeof(MachineEditingCompositionRoot).GetMethod("StateSyncCompose", + return typeof(MainEditingCompositionRoot).GetMethod("Compose", BindingFlags.Public | BindingFlags.Static); } }