Update to MC 1.19.3.

build.gradle

@@ -39,7 +39,7 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     // Just for in-dev convenience. Mod doesn't use any JEI APIs.
-    runtimeOnly fg.deobf("curse.maven:jei-238222:4239206")
+    runtimeOnly fg.deobf("curse.maven:jei-238222:4354617")
 }
 
 minecraft {

gradle.properties

@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-minecraft_version=1.19.2
+minecraft_version=1.19.3
 
 archives_base_name=bedrockores
 maven_group=li.cil.bedrockores
 
-forge_version=43.2.3
+forge_version=44.1.0
 
 # Set by build pipeline.
 semver=0.0.0

src/main/java/li/cil/bedrockores/client/render/BedrockOreModel.java

@@ -1,28 +1,24 @@
 package li.cil.bedrockores.client.render;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.*;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
 import net.minecraftforge.client.model.geometry.IUnbakedGeometry;
 
-import java.util.Collection;
 import java.util.Set;
 import java.util.function.Function;
 
 public final class BedrockOreModel implements IUnbakedGeometry<BedrockOreModel> {
     @Override
-    public BakedModel bake(final IGeometryBakingContext context, final ModelBakery baker, final Function<Material, TextureAtlasSprite> spriteGetter, final ModelState modelState, final ItemOverrides overrides, final ResourceLocation modelLocation) {
+    public BakedModel bake(final IGeometryBakingContext context, final ModelBaker baker, final Function<Material, TextureAtlasSprite> spriteGetter, final ModelState modelState, final ItemOverrides overrides, final ResourceLocation modelLocation) {
         return new BedrockOreBakedModel();
     }
 
     @Override
-    public Collection<Material> getMaterials(final IGeometryBakingContext context, final Function<ResourceLocation, UnbakedModel> modelGetter, final Set<Pair<String, String>> missingTextureErrors) {
-        return ImmutableList.of();
+    public void resolveParents(final Function<ResourceLocation, UnbakedModel> modelGetter, final IGeometryBakingContext context) {
     }
 
     @Override

src/main/java/li/cil/bedrockores/client/render/BlockEntityInfoRenderer.java

@@ -1,7 +1,6 @@
 package li.cil.bedrockores.client.render;
 
 import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.math.Matrix4f;
 import li.cil.bedrockores.common.block.entity.BlockEntityWithInfo;
 import li.cil.bedrockores.common.config.Constants;
 import li.cil.bedrockores.common.config.Settings;
@@ -67,7 +66,7 @@ public static void onWorldRender(final RenderLevelStageEvent event) {
 
         stack.scale(-0.025f, -0.025f, 0.025f);
 
-        final Matrix4f matrix = stack.last().pose();
+        final var matrix = stack.last().pose();
 
         final Font font = Minecraft.getInstance().font;
         final MultiBufferSource.BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());

src/main/java/li/cil/bedrockores/common/item/Items.java

@@ -3,7 +3,6 @@
 import li.cil.bedrockores.common.block.Blocks;
 import li.cil.bedrockores.common.config.Constants;
 import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.DeferredRegister;
@@ -15,7 +14,7 @@ public final class Items {
 
     // --------------------------------------------------------------------- //
 
-    public static final RegistryObject<Item> BEDROCK_MINER = ITEMS.register(Blocks.BEDROCK_MINER.getId().getPath(), () -> new BlockItem(Blocks.BEDROCK_MINER.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
+    public static final RegistryObject<Item> BEDROCK_MINER = ITEMS.register(Blocks.BEDROCK_MINER.getId().getPath(), () -> new BlockItem(Blocks.BEDROCK_MINER.get(), new Item.Properties()));
 
     // --------------------------------------------------------------------- //
 

src/main/java/li/cil/bedrockores/common/item/ModCreativeModTabs.java

@@ -0,0 +1,18 @@
+package li.cil.bedrockores.common.item;
+
+import li.cil.bedrockores.common.config.Constants;
+import net.minecraft.world.item.CreativeModeTabs;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.event.CreativeModeTabEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD, modid = Constants.MOD_ID)
+public final class ModCreativeModTabs {
+    @SubscribeEvent
+    public static void handleCreativeTabEvent(final CreativeModeTabEvent.BuildContents event) {
+        if (event.getTab() == CreativeModeTabs.FUNCTIONAL_BLOCKS) {
+            event.accept(Items.BEDROCK_MINER.get());
+        }
+    }
+}

src/main/java/li/cil/bedrockores/common/sound/Sounds.java

@@ -13,7 +13,7 @@ public final class Sounds {
 
     // --------------------------------------------------------------------- //
 
-    public static final RegistryObject<SoundEvent> MINER = SOUND_EVENTS.register("bedrock_miner", () -> new SoundEvent(new ResourceLocation(Constants.MOD_ID, "bedrock_miner")));
+    public static final RegistryObject<SoundEvent> MINER = SOUND_EVENTS.register("bedrock_miner", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(Constants.MOD_ID, "bedrock_miner")));
 
     // --------------------------------------------------------------------- //
 

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[43,)"
+loaderVersion = "[44,)"
 issueTrackerURL = "https://github.com/MightyPirates/BedrockOres/issues"
 license = "MIT"
 
@@ -16,12 +16,12 @@ Large ore deposits embedded in the bedrock.
 [[dependencies.bedrockores]]
 modId = "forge"
 mandatory = true
-versionRange = "[43.2.0,)"
+versionRange = "[44.1.0,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.bedrockores]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.2,)"
+versionRange = "[1.19.3,)"
 ordering = "NONE"
 side = "BOTH"

src/main/resources/assets/bedrockores/models/block/bedrock_miner.json

@@ -338,9 +338,9 @@
     }
   ],
   "textures": {
-    "top": "bedrockores:blocks/bedrock_miner_top",
-    "side": "bedrockores:blocks/bedrock_miner_side",
-    "bottom": "bedrockores:blocks/bedrock_miner_bottom",
+    "top": "bedrockores:block/bedrock_miner_top",
+    "side": "bedrockores:block/bedrock_miner_side",
+    "bottom": "bedrockores:block/bedrock_miner_bottom",
     "particle": "#side"
   }
 }

src/main/resources/assets/bedrockores/models/block/bedrock_ore_mask.json

@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "bedrockores:blocks/bedrock_ore_mask"
+    "all": "bedrockores:block/bedrock_ore_mask"
   },
   "render_type": "minecraft:cutout"
 }

src/main/resources/assets/bedrockores/models/block/bedrock_ore_mask_mirrored.json

@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:block/cube_mirrored_all",
   "textures": {
-    "all": "bedrockores:blocks/bedrock_ore_mask"
+    "all": "bedrockores:block/bedrock_ore_mask"
   },
   "render_type": "minecraft:cutout"
 }