Merge remote-tracking branch 'origin/1.21.1' into 1.21.1

Author: Alwis2000

gradlew

@@ -1,7 +1,9 @@
 {
-  "loader": "dynamictrees:branch",
+  "loader": "dtru:bamboo",
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "bark": "regions_unexplored:block/bamboo_log",
-    "rings": "regions_unexplored:block/bamboo_log"
+    "rings": "regions_unexplored:block/bamboo_log",
+    "leaves": "regions_unexplored:block/bamboo_log_leaves"
   }
 }

src/generated/resources/assets/dtru/models/block/bamboo_branch.json

@@ -1,7 +1,9 @@
 {
-  "loader": "dynamictrees:branch",
+  "loader": "dtru:bamboo",
+  "render_type": "minecraft:cutout_mipped",
   "textures": {
     "bark": "regions_unexplored:block/stripped_bamboo_log",
-    "rings": "regions_unexplored:block/stripped_bamboo_log"
+    "rings": "regions_unexplored:block/stripped_bamboo_log",
+    "leaves": "dynamictrees:block/air"
   }
 }

src/generated/resources/assets/dtru/models/block/stripped_bamboo_branch.json

@@ -1,7 +1,8 @@
 {
-  "parent": "dynamictrees:item/branch",
+  "parent": "dtru:item/branch_bamboo",
   "textures": {
     "bark": "regions_unexplored:block/bamboo_log",
-    "rings": "regions_unexplored:block/bamboo_log"
+    "rings": "regions_unexplored:block/bamboo_log",
+    "leaves": "regions_unexplored:block/bamboo_log_leaves"
   }
 }

src/generated/resources/assets/dtru/models/item/bamboo_branch.json

@@ -54,7 +54,7 @@ public class BambooBranchBlockBakedModel implements IDynamicBakedModel {
 
     protected final BlockModel blockModel;
 
-    protected final ResourceLocation modelLocation;
+    // protected final ResourceLocation modelLocation;
 
     protected final TextureAtlasSprite barkTexture;
     protected final TextureAtlasSprite ringsTexture;
@@ -66,12 +66,12 @@ public class BambooBranchBlockBakedModel implements IDynamicBakedModel {
     protected final BakedModel[] rings = new BakedModel[8]; // 8 Cores with the ring textures on all 6 sides.
     protected BakedModel leaves;
 
-    public BambooBranchBlockBakedModel(ResourceLocation modelLocation, ResourceLocation barkTextureLocation, ResourceLocation ringsTextureLocation, ResourceLocation leavesTextureLocation,
+    public BambooBranchBlockBakedModel(IGeometryBakingContext context, ResourceLocation barkTextureLocation, ResourceLocation ringsTextureLocation, ResourceLocation leavesTextureLocation,
                                        Function<Material, TextureAtlasSprite> spriteGetter) {
         this.blockModel = new BlockModel(null, new ArrayList<>(), new HashMap<>(), false, BlockModel.GuiLight.FRONT,
                 ItemTransforms.NO_TRANSFORMS, new ArrayList<>());
-//        this.blockModel.customData.setRenderTypeHint(customData.getRenderTypeHint());
-        this.modelLocation = modelLocation;
+        this.blockModel.customData.setRenderTypeHint(context.getRenderTypeHint());
+        // this.modelLocation = modelLocation;
         this.barkTexture = spriteGetter.apply(new Material(InventoryMenu.BLOCK_ATLAS, barkTextureLocation));
         this.ringsTexture = spriteGetter.apply(new Material(InventoryMenu.BLOCK_ATLAS, ringsTextureLocation));
         this.leavesTexture = spriteGetter.apply(new Material(InventoryMenu.BLOCK_ATLAS, leavesTextureLocation));

src/main/java/dtteam/dtru/model/BambooBranchBlockBakedModel.java

@@ -37,6 +37,6 @@ public BambooBranchBlockModelGeometry(ResourceLocation barkTextureLocation, Reso
 
     @Override
     public BakedModel bake(IGeometryBakingContext context, ModelBaker modelBaker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides itemOverrides) {
-        return new BambooBranchBlockBakedModel(ResourceLocation.tryParse(context.getModelName()), this.barkTextureLocation, this.ringsTextureLocation, this.leavesTextureLocation, spriteGetter);
+        return new BambooBranchBlockBakedModel(context, this.barkTextureLocation, this.ringsTextureLocation, this.leavesTextureLocation, spriteGetter);
     }
 }