From d85ea5a3b0bb03dc62263ced862fcf7a38f93c72 Mon Sep 17 00:00:00 2001
From: tterrag <tterrag1098@gmail.com>
Date: Sat, 28 Nov 2020 21:10:08 -0500
Subject: [PATCH] Fix datagen order of multipart conditions being unstable

---
 .../client/model/generators/MultiPartBlockStateBuilder.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java
index 288485a87..abb368818 100644
--- a/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java
+++ b/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import com.google.common.collect.MultimapBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 
@@ -74,7 +74,7 @@ public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate {
     public class PartBuilder {
         public BlockStateProvider.ConfiguredModelList models;
         public boolean useOr;
-        public final Multimap<Property<?>, Comparable<?>> conditions = HashMultimap.create();
+        public final Multimap<Property<?>, Comparable<?>> conditions = MultimapBuilder.linkedHashKeys().arrayListValues().build();
 
         PartBuilder(BlockStateProvider.ConfiguredModelList models) {
             this.models = models;