mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
[1.19.3] Hotfix missing null check in createUnbakedItemElements (#9285)
This commit is contained in:
1 parent
b0a68b8c79
commit
43580f5804
6 files changed
+34
-11
No files matched your search
+17
-2
@@ -1,9 +1,10 @@
|
||||
--- a/net/minecraft/client/renderer/block/model/BlockElement.java
|
||||
+++ b/net/minecraft/client/renderer/block/model/BlockElement.java
|
||||
@@ -28,14 +_,21 @@
|
||||
@@ -28,14 +_,22 @@
|
||||
public final Map<Direction, BlockElementFace> f_111310_;
|
||||
public final BlockElementRotation f_111311_;
|
||||
public final boolean f_111312_;
|
||||
+ @Deprecated // TODO: 1.20 - Make private. Use getter / setter methods to access.
|
||||
+ public net.minecraftforge.client.model.ForgeFaceData faceData;
|
||||
|
||||
public BlockElement(Vector3f p_253626_, Vector3f p_254426_, Map<Direction, BlockElementFace> p_254454_, @Nullable BlockElementRotation p_254229_, boolean p_253661_) {
|
||||
@@ -17,7 +18,7 @@
|
||||
this.f_111311_ = p_254229_;
|
||||
this.f_111312_ = p_253661_;
|
||||
this.m_111319_();
|
||||
+ this.faceData = faceData;
|
||||
+ this.setFaceData(faceData);
|
||||
+ this.f_111310_.values().forEach(face -> face.parent = this);
|
||||
}
|
||||
|
||||
@@ -32,3 +33,17 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -179,5 +_,13 @@
|
||||
return new Vector3f(afloat[0], afloat[1], afloat[2]);
|
||||
}
|
||||
}
|
||||
+ }
|
||||
+
|
||||
+ public net.minecraftforge.client.model.ForgeFaceData getFaceData() {
|
||||
+ return this.faceData;
|
||||
+ }
|
||||
+
|
||||
+ public void setFaceData(net.minecraftforge.client.model.ForgeFaceData faceData) {
|
||||
+ this.faceData = java.util.Objects.requireNonNull(faceData);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
+ if(this.faceData != null) {
|
||||
+ return this.faceData;
|
||||
+ } else if(this.parent != null) {
|
||||
+ return this.parent.faceData;
|
||||
+ return this.parent.getFaceData();
|
||||
+ }
|
||||
+ return net.minecraftforge.client.model.ForgeFaceData.DEFAULT;
|
||||
}
|
||||
|
||||
+8
-3
@@ -1,8 +1,13 @@
|
||||
{
|
||||
"parent": "forge:item/default",
|
||||
"emissive_layers": [
|
||||
1
|
||||
],
|
||||
"forge_data": {
|
||||
"layers": {
|
||||
"1": {
|
||||
"block_light": 15,
|
||||
"sky_light": 15
|
||||
}
|
||||
}
|
||||
},
|
||||
"loader": "forge:item_layers",
|
||||
"render_types": {},
|
||||
"textures": {
|
||||
|
||||
@@ -133,7 +133,7 @@ public class UnbakedGeometryHelper
|
||||
*/
|
||||
public static List<BlockElement> createUnbakedItemElements(int layerIndex, SpriteContents spriteContents)
|
||||
{
|
||||
return createUnbakedItemElements(layerIndex, spriteContents, null);
|
||||
return createUnbakedItemElements(layerIndex, spriteContents, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -145,7 +145,10 @@ public class UnbakedGeometryHelper
|
||||
public static List<BlockElement> createUnbakedItemElements(int layerIndex, SpriteContents spriteContents, @Nullable ForgeFaceData faceData)
|
||||
{
|
||||
var elements = ITEM_MODEL_GENERATOR.processFrames(layerIndex, "layer" + layerIndex, spriteContents);
|
||||
elements.forEach(element -> element.faceData = faceData);
|
||||
if(faceData != null)
|
||||
{
|
||||
elements.forEach(element -> element.setFaceData(faceData));
|
||||
}
|
||||
return elements;
|
||||
}
|
||||
|
||||
@@ -154,7 +157,7 @@ public class UnbakedGeometryHelper
|
||||
*/
|
||||
public static List<BlockElement> createUnbakedItemMaskElements(int layerIndex, SpriteContents spriteContents)
|
||||
{
|
||||
return createUnbakedItemMaskElements(layerIndex, spriteContents, null);
|
||||
return createUnbakedItemMaskElements(layerIndex, spriteContents, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -57,7 +57,7 @@ import org.slf4j.Logger;
|
||||
@Mod(DataPackRegistriesTest.MODID)
|
||||
public class DataPackRegistriesTest
|
||||
{
|
||||
private static final boolean ENABLED = true;
|
||||
private static final boolean ENABLED = false;
|
||||
public static final String MODID = "data_pack_registries_test";
|
||||
private static final Logger LOGGER = LogUtils.getLogger();
|
||||
private static final ResourceLocation TEST_RL = new ResourceLocation(MODID, "test");
|
||||
|
||||
@@ -14,7 +14,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.HolderSet;;
|
||||
import net.minecraft.core.HolderSet;
|
||||
import net.minecraft.core.RegistrySetBuilder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.data.DataProvider;
|
||||
|
||||
Reference in new issue
Block a user