fix?: mushroom item model, transparency

Argent-Matter · Jan 8, 2024 · f1f7d29 · f1f7d29
1 parent 0df69e1
commit f1f7d29
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/common/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java b/common/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java
@@ -122,9 +122,10 @@ public class GCyRBlocks {
             .block("prb_underground_mushroom", (p) -> new MushroomBlock(p, null /*todo fix*/))
             .initialProperties(() -> Blocks.BROWN_MUSHROOM)
             .properties(p -> p.mapColor(MapColor.COLOR_CYAN))
+            .addLayer(() -> RenderType::cutout)
             .blockstate(GCyRModels::crossModel)
             .item()
-            .defaultModel()
+            .model(GCyRModels::blockTextureGeneratedModel)
             .build()
             .register();
 

diff --git a/common/src/main/java/argent_matter/gcyr/common/data/GCyRModels.java b/common/src/main/java/argent_matter/gcyr/common/data/GCyRModels.java
@@ -5,11 +5,12 @@
 import argent_matter.gcyr.common.block.RocketMotorBlock;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
+import com.tterrag.registrate.providers.RegistrateItemModelProvider;
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CarpetBlock;
 import net.minecraft.world.level.block.DoorBlock;
-import net.minecraft.world.level.block.RotatedPillarBlock;
 
 public class GCyRModels {
 
@@ -42,4 +43,9 @@ public static void randomRotatedModel(DataGenContext<Block, ? extends Block> ctx
     public static void crossModel(DataGenContext<Block, ? extends Block> ctx, RegistrateBlockstateProvider prov) {
         throw new AssertionError();
     }
+
+    @ExpectPlatform
+    public static void blockTextureGeneratedModel(DataGenContext<Item, ? extends Item> ctx, RegistrateItemModelProvider prov) {
+        throw new AssertionError();
+    }
 }
diff --git a/fabric/src/main/java/argent_matter/gcyr/common/data/fabric/GCyRModelsImpl.java b/fabric/src/main/java/argent_matter/gcyr/common/data/fabric/GCyRModelsImpl.java
@@ -6,10 +6,12 @@
 import argent_matter.gcyr.common.block.RocketMotorBlock;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
+import com.tterrag.registrate.providers.RegistrateItemModelProvider;
 import io.github.fabricators_of_create.porting_lib.models.generators.ConfiguredModel;
 import io.github.fabricators_of_create.porting_lib.models.generators.ModelFile;
 import io.github.fabricators_of_create.porting_lib.models.generators.ModelProvider;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CarpetBlock;
 import net.minecraft.world.level.block.DoorBlock;
@@ -58,4 +60,8 @@ public static void crossModel(DataGenContext<Block, ? extends Block> ctx, Regist
         ModelFile cross = prov.models().cross(ctx.getName(), prov.blockTexture(block));
         prov.simpleBlock(block, cross);
     }
+
+    public static void blockTextureGeneratedModel(DataGenContext<Item, ? extends Item> ctx, RegistrateItemModelProvider prov) {
+        prov.generated(ctx::getEntry, prov.modLoc("block/" + ctx.getName()));
+    }
 }
diff --git a/forge/src/main/java/argent_matter/gcyr/common/data/forge/GCyRModelsImpl.java b/forge/src/main/java/argent_matter/gcyr/common/data/forge/GCyRModelsImpl.java
@@ -6,7 +6,9 @@
 import argent_matter.gcyr.common.block.RocketMotorBlock;
 import com.tterrag.registrate.providers.DataGenContext;
 import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
+import com.tterrag.registrate.providers.RegistrateItemModelProvider;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.CarpetBlock;
 import net.minecraft.world.level.block.DoorBlock;
@@ -58,4 +60,8 @@ public static void crossModel(DataGenContext<Block, ? extends Block> ctx, Regist
         ModelFile cross = prov.models().cross(ctx.getName(), prov.blockTexture(block));
         prov.simpleBlock(block, cross);
     }
+
+    public static void blockTextureGeneratedModel(DataGenContext<Item, ? extends Item> ctx, RegistrateItemModelProvider prov) {
+        prov.generated(ctx::getEntry, prov.modLoc("block/" + ctx.getName()));
+    }
 }