Port to 1.19.4 [build] [publish]

changelog.md

@@ -1 +1 @@
-* Initial update to 1.19.3
+* Initial update to 1.19.4

gradle.properties

@@ -4,18 +4,18 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Base info
-mc_version=1.19.3
-forge_version=44.1.23
+mc_version=1.19.4
+forge_version=45.0.43
 mcp_channel=official
-mcp_mappings=1.19.3
+mcp_mappings=1.19.4
 
 #Publishing
 mod_name=Chowder Express
 curseforge_id=783410
 modrinth_id=CcY0wAVw
 
 # Version
-version=1.2.0
+version=1.3.0
 
 # Dependencies
-jei_version=12.4.0.22
+jei_version=13.1.0.2

src/generated/resources/.cache/57d5777fd2b2e3e2d3a9bf81b29e44ed8cdd2e32

@@ -1,2 +1,2 @@
-// 1.19.3	2023-04-18T01:11:03.260432	Tags for minecraft:item mod id chowderexpress
+// 1.19.4	2023-04-18T02:25:24.4893774	Tags for minecraft:item mod id chowderexpress
 953a2d84283eb74fab164e4f15b3e025b4969366 data/chowderexpress/tags/items/soups.json

src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e

@@ -1,2 +1,2 @@
-// 1.19.3	2023-04-18T01:11:03.262435	Sound Definitions
+// 1.19.4	2023-04-18T02:25:24.4903748	Sound Definitions
 45ca0a31bdc571cd49597904ef98727e71f3f745 assets/chowderexpress/sounds.json

src/generated/resources/.cache/7e525897593986ac2e1f06833391b3073f4901d1

@@ -0,0 +1 @@
+// 1.19.4	2023-04-18T02:25:24.4898744	Tags for minecraft:block mod id chowderexpress

src/generated/resources/.cache/83a57a3b11e7a1a7fc4fb05f27595187ce2e309a

@@ -1,2 +1,2 @@
-// 1.19.3	2023-04-18T01:11:03.258932	Item Models: chowderexpress
+// 1.19.4	2023-04-18T02:25:24.4873741	Item Models: chowderexpress
 6890e612ff24d2d617b406b23b447c50fa99328b assets/chowderexpress/models/item/soup_cart.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,3 +1,3 @@
-// 1.19.3	2023-04-18T01:11:03.2599322	Recipes
+// 1.19.4	2023-04-18T02:25:24.4888746	Recipes
 87697b9ff626777c081797471122ff69ff48481b data/chowderexpress/advancements/recipes/transportation/soup_cart.json
 0c7d883f64cfaac177d4bdb70b2048282692ba1f data/chowderexpress/recipes/soup_cart.json

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.19.3	2023-04-18T01:11:03.2619605	Languages: en_us
+// 1.19.4	2023-04-18T02:25:24.4898744	Languages: en_us
 63b8ca789489a584e633ade76911ec515a7315a7 assets/chowderexpress/lang/en_us.json

src/main/java/com/mrbysco/chowderexpress/client/SoupRenderTypes.java

@@ -47,7 +47,6 @@ public static class SoupTextureStateShard extends RenderStateShard.EmptyTextureS
 
 		public SoupTextureStateShard(ResourceLocation resourceLocation, boolean blur, boolean mipmap) {
 			super(() -> {
-				RenderSystem.enableTexture();
 				TextureManager texturemanager = Minecraft.getInstance().getTextureManager();
 				texturemanager.getTexture(resourceLocation);
 				AbstractTexture texture = texturemanager.getTexture(resourceLocation, null);

src/main/java/com/mrbysco/chowderexpress/data/CartDatagen.java

@@ -28,8 +28,9 @@ public static void gatherData(GatherDataEvent event) {
 
 		if (event.includeServer()) {
 			generator.addProvider(event.includeClient(), new CartRecipes(packOutput));
-			BlockTagsProvider blockTagsProvider = new CartBlockTagProvider(packOutput, lookupProvider, helper);
-			generator.addProvider(event.includeServer(), new CartItemTagProvider(packOutput, lookupProvider, blockTagsProvider, helper));
+			BlockTagsProvider blockTagsProvider;
+			generator.addProvider(event.includeServer(), blockTagsProvider = new CartBlockTagProvider(packOutput, lookupProvider, helper));
+			generator.addProvider(event.includeServer(), new CartItemTagProvider(packOutput, lookupProvider, blockTagsProvider.contentsGetter(), helper));
 		}
 		if (event.includeClient()) {
 			generator.addProvider(event.includeClient(), new CartLanguageProvider(packOutput));

src/main/java/com/mrbysco/chowderexpress/data/server/CartItemTagProvider.java

@@ -9,14 +9,15 @@
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
 import net.minecraftforge.common.data.ExistingFileHelper;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 
 public class CartItemTagProvider extends ItemTagsProvider {
 
-	public CartItemTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
-							   TagsProvider<Block> blockTagProvider, ExistingFileHelper existingFileHelper) {
-		super(output, lookupProvider, blockTagProvider, ChowderExpress.MOD_ID, existingFileHelper);
+	public CartItemTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> providerCompletableFuture,
+							   CompletableFuture<TagsProvider.TagLookup<Block>> completableFuture, @Nullable net.minecraftforge.common.data.ExistingFileHelper fileHelper) {
+		super(packOutput, providerCompletableFuture, completableFuture, ChowderExpress.MOD_ID, fileHelper);
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[44,)"
+loaderVersion="[45,)"
 issueTrackerURL="https://github.com/Mrbysco/ChowderExpress/issues"
 license="MIT"
 
@@ -15,6 +15,6 @@ Chowder Express is a mod that allows players to fill minecarts with soup and rid
 [[dependencies.chowderexpress]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.19.3,1.20)"
+versionRange="[1.19.4,1.20)"
 ordering="NONE"
 side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,8 +1,8 @@
 {
   "pack": {
     "description": "Chowder Express resources",
-    "pack_format": 12,
-    "forge:resource_pack_format": 12,
-    "forge:data_pack_format": 10
+    "pack_format": 13,
+    "forge:client_resources_pack_format": 13,
+    "forge:server_data_pack_format": 12
   }
 }