Updated neo

KubeJS-Mods · Jun 27, 2024 · de940e3 · de940e3
1 parent d165674
commit de940e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ modrinth_id=umyGl7zF
 minecraft_version=1.21
 mod_version=2100.7.0
 
-neoforge_version=21.0.40-beta
+neoforge_version=21.0.42-beta
 parchment_version=2024.06.23
 rhino_version=2100.2.5-build.32
 architectury_version=13.0.2

diff --git a/src/main/java/dev/latvian/mods/kubejs/fluid/KubeJSFluidIngredients.java b/src/main/java/dev/latvian/mods/kubejs/fluid/KubeJSFluidIngredients.java
@@ -1,7 +1,6 @@
 package dev.latvian.mods.kubejs.fluid;
 
 import dev.latvian.mods.kubejs.KubeJS;
-import net.minecraft.network.codec.StreamCodec;
 import net.neoforged.neoforge.fluids.crafting.FluidIngredientType;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
@@ -11,8 +10,6 @@
 public interface KubeJSFluidIngredients {
 	DeferredRegister<FluidIngredientType<?>> REGISTRY = DeferredRegister.create(NeoForgeRegistries.FLUID_INGREDIENT_TYPES, KubeJS.MOD_ID);
 
-	// TODO: Report to NeoForge that stream codec should be <? super>
-	Supplier<FluidIngredientType<?>> REGEX = REGISTRY.register("regex", () -> new FluidIngredientType<>(RegExFluidIngredient.CODEC, (StreamCodec) RegExFluidIngredient.STREAM_CODEC));
-
-	Supplier<FluidIngredientType<?>> NAMESPACE = REGISTRY.register("namespace", () -> new FluidIngredientType<>(NamespaceFluidIngredient.CODEC, (StreamCodec) NamespaceFluidIngredient.STREAM_CODEC));
+	Supplier<FluidIngredientType<?>> REGEX = REGISTRY.register("regex", () -> new FluidIngredientType<>(RegExFluidIngredient.CODEC, RegExFluidIngredient.STREAM_CODEC));
+	Supplier<FluidIngredientType<?>> NAMESPACE = REGISTRY.register("namespace", () -> new FluidIngredientType<>(NamespaceFluidIngredient.CODEC, NamespaceFluidIngredient.STREAM_CODEC));
 }
diff --git a/src/main/java/dev/latvian/mods/kubejs/ingredient/KubeJSIngredients.java b/src/main/java/dev/latvian/mods/kubejs/ingredient/KubeJSIngredients.java
@@ -1,7 +1,6 @@
 package dev.latvian.mods.kubejs.ingredient;
 
 import dev.latvian.mods.kubejs.KubeJS;
-import net.minecraft.network.codec.StreamCodec;
 import net.neoforged.neoforge.common.crafting.IngredientType;
 import net.neoforged.neoforge.registries.DeferredRegister;
 import net.neoforged.neoforge.registries.NeoForgeRegistries;
@@ -11,10 +10,9 @@
 public interface KubeJSIngredients {
 	DeferredRegister<IngredientType<?>> REGISTRY = DeferredRegister.create(NeoForgeRegistries.Keys.INGREDIENT_TYPES, KubeJS.MOD_ID);
 
-	// FIXME: Neo bug
-	Supplier<IngredientType<WildcardIngredient>> WILDCARD = REGISTRY.register("wildcard", () -> new IngredientType<>(WildcardIngredient.CODEC, (StreamCodec) WildcardIngredient.STREAM_CODEC));
-	Supplier<IngredientType<TagIngredient>> TAG = REGISTRY.register("tag", () -> new IngredientType<>(TagIngredient.CODEC, (StreamCodec) TagIngredient.STREAM_CODEC));
-	Supplier<IngredientType<NamespaceIngredient>> NAMESPACE = REGISTRY.register("namespace", () -> new IngredientType<>(NamespaceIngredient.CODEC, (StreamCodec) NamespaceIngredient.STREAM_CODEC));
-	Supplier<IngredientType<RegExIngredient>> REGEX = REGISTRY.register("regex", () -> new IngredientType<>(RegExIngredient.CODEC, (StreamCodec) RegExIngredient.STREAM_CODEC));
+	Supplier<IngredientType<WildcardIngredient>> WILDCARD = REGISTRY.register("wildcard", () -> new IngredientType<>(WildcardIngredient.CODEC, WildcardIngredient.STREAM_CODEC));
+	Supplier<IngredientType<TagIngredient>> TAG = REGISTRY.register("tag", () -> new IngredientType<>(TagIngredient.CODEC, TagIngredient.STREAM_CODEC));
+	Supplier<IngredientType<NamespaceIngredient>> NAMESPACE = REGISTRY.register("namespace", () -> new IngredientType<>(NamespaceIngredient.CODEC, NamespaceIngredient.STREAM_CODEC));
+	Supplier<IngredientType<RegExIngredient>> REGEX = REGISTRY.register("regex", () -> new IngredientType<>(RegExIngredient.CODEC, RegExIngredient.STREAM_CODEC));
 	Supplier<IngredientType<CreativeTabIngredient>> CREATIVE_TAB = REGISTRY.register("creative_tab", () -> new IngredientType<>(CreativeTabIngredient.CODEC, CreativeTabIngredient.STREAM_CODEC));
 }