From db3d202c4e039fe39bdb69dcd8733739f757d8b5 Mon Sep 17 00:00:00 2001
From: tterrag <tterrag1098@gmail.com>
Date: Thu, 19 Mar 2020 23:37:21 -0400
Subject: [PATCH] Deprecate ModelBuilder#gui3d, add ModelBuilder#guiLight

---
 .../renderer/model/BlockModel.java.patch      |  8 ++++++++
 .../client/model/generators/ModelBuilder.java | 19 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/patches/minecraft/net/minecraft/client/renderer/model/BlockModel.java.patch b/patches/minecraft/net/minecraft/client/renderer/model/BlockModel.java.patch
index 55dd51aa5..9e6766585 100644
--- a/patches/minecraft/net/minecraft/client/renderer/model/BlockModel.java.patch
+++ b/patches/minecraft/net/minecraft/client/renderer/model/BlockModel.java.patch
@@ -78,3 +78,11 @@
     public boolean func_178300_b(String p_178300_1_) {
        return !MissingTextureSprite.func_195675_b().equals(this.func_228816_c_(p_178300_1_).func_229313_b_());
     }
+@@ -373,5 +396,7 @@
+       public boolean func_230178_a_() {
+          return this == SIDE;
+       }
++      
++      public String getSerializedName() { return field_230177_c_; }
+    }
+ }
diff --git a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java
index 4ac7842a2..b9c25ad9e 100644
--- a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java
+++ b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java
@@ -43,6 +43,7 @@ import net.minecraft.client.renderer.model.BlockPartFace;
 import net.minecraft.client.renderer.model.BlockPartRotation;
 import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
 import net.minecraft.client.renderer.model.ItemTransformVec3f;
+import net.minecraft.client.renderer.model.BlockModel.GuiLight;
 import net.minecraft.client.renderer.texture.MissingTextureSprite;
 import net.minecraft.resources.ResourcePackType;
 import net.minecraft.util.Direction;
@@ -69,7 +70,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
     protected final ExistingFileHelper existingFileHelper;
 
     protected boolean ambientOcclusion = true;
-    protected boolean gui3d = false;
+    protected GuiLight guiLight = null;
 
     protected final List<ElementBuilder> elements = new ArrayList<>();
 
@@ -160,8 +161,18 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
         return self();
     }
 
+    /**
+     * @param gui3d
+     * @return this builder
+     * @deprecated Unused in 1.15, use {@link #guiLight(GuiLight)} instead.
+     */
+    @Deprecated
     public T gui3d(boolean gui3d) {
-        this.gui3d = gui3d;
+        return self();
+    }
+    
+    public T guiLight(GuiLight light) {
+        this.guiLight = light;
         return self();
     }
 
@@ -193,6 +204,10 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
         if (!this.ambientOcclusion) {
             root.addProperty("ambientocclusion", this.ambientOcclusion);
         }
+        
+        if (this.guiLight != null) {
+            root.addProperty("gui_light", this.guiLight.getSerializedName());
+        }
 
         Map<Perspective, ItemTransformVec3f> transforms = this.transforms.build();
         if (!transforms.isEmpty()) {