Removed JEI and REI Kube plugins, some bug fixes

KubeJS-Mods · Jul 2, 2024 · 6aad24c · 6aad24c
1 parent 603caf3
commit 6aad24c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 37 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ mod_version=2100.7.0
 
 neoforge_version=21.0.47-beta
 parchment_version=2024.06.23
-rhino_version=2100.2.5-build.33
+rhino_version=2100.2.5-build.34
 architectury_version=13.0.3
 
 rei_version=16.0.729

diff --git a/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java b/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java
@@ -58,6 +58,7 @@
 import dev.latvian.mods.kubejs.fluid.ThickFluidBuilder;
 import dev.latvian.mods.kubejs.fluid.ThinFluidBuilder;
 import dev.latvian.mods.kubejs.item.ArmorMaterialBuilder;
+import dev.latvian.mods.kubejs.item.ChancedIngredient;
 import dev.latvian.mods.kubejs.item.ChancedItem;
 import dev.latvian.mods.kubejs.item.ItemEnchantmentsWrapper;
 import dev.latvian.mods.kubejs.item.ItemPredicate;
@@ -581,6 +582,9 @@ public void registerRecipeComponents(RecipeComponentFactoryRegistry registry) {
 		registry.register(SizedFluidIngredientComponent.FLAT);
 		registry.register(SizedFluidIngredientComponent.NESTED);
 
+		registry.register(ChancedItem.RECIPE_COMPONENT);
+		registry.register(ChancedIngredient.RECIPE_COMPONENT);
+
 		registry.register(BlockComponent.BLOCK);
 
 		registry.register(BlockStateComponent.BLOCK);

diff --git a/src/main/java/dev/latvian/mods/kubejs/generator/AssetJsonGenerator.java b/src/main/java/dev/latvian/mods/kubejs/generator/AssetJsonGenerator.java
@@ -52,7 +52,7 @@ public static ResourceLocation asItemModelLocation(ResourceLocation id) {
 
 	public void texture(ResourceLocation target, LoadedTexture texture) {
 		if (texture.width <= 0 || texture.height <= 0) {
-			ConsoleJS.CLIENT.error("Failed to load texture " + target);
+			ConsoleJS.CLIENT.error("Failed to save texture " + target);
 			return;
 		}
 
@@ -65,18 +65,28 @@ public void texture(ResourceLocation target, LoadedTexture texture) {
 
 	public void stencil(ResourceLocation target, ResourceLocation stencil, Map<Color, Color> colors) {
 		var stencilTexture = loadTexture(stencil);
+
+		if (stencilTexture.width == 0 || stencilTexture.height == 0) {
+			ConsoleJS.CLIENT.error("Failed to load texture " + stencil);
+			return;
+		}
+
 		texture(target, stencilTexture.remap(colors));
 	}
 
 	public boolean mask(ResourceLocation target, ResourceLocation mask, ResourceLocation input) {
 		var maskTexture = loadTexture(mask);
 
-		if (maskTexture.height != maskTexture.width) {
+		if (maskTexture.height != maskTexture.width || maskTexture.width == 0) {
 			return false;
 		}
 
 		var in = loadTexture(input);
 
+		if (in.width == 0 || in.height == 0) {
+			return false;
+		}
+
 		int w = Math.max(maskTexture.width, in.width);
 
 		if (maskTexture.width != in.width) {

diff --git a/src/main/java/dev/latvian/mods/kubejs/integration/jei/JEIIntegration.java b/src/main/java/dev/latvian/mods/kubejs/integration/jei/JEIIntegration.java
@@ -1,7 +1,6 @@
 package dev.latvian.mods.kubejs.integration.jei;
 
 import dev.latvian.mods.kubejs.item.ItemPredicate;
-import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
 import dev.latvian.mods.kubejs.recipe.viewer.RecipeViewerEntryType;
 import dev.latvian.mods.rhino.Context;
 import mezz.jei.api.constants.VanillaTypes;
@@ -10,7 +9,7 @@
 import net.neoforged.neoforge.fluids.crafting.FluidIngredient;
 import org.jetbrains.annotations.Nullable;
 
-public class JEIIntegration implements KubeJSPlugin {
+public class JEIIntegration {
 	@Nullable
 	public static IIngredientType<?> typeOf(RecipeViewerEntryType type) {
 		if (type == RecipeViewerEntryType.ITEM) {

diff --git a/src/main/java/dev/latvian/mods/kubejs/integration/rei/REIIntegration.java b/src/main/java/dev/latvian/mods/kubejs/integration/rei/REIIntegration.java
@@ -2,7 +2,6 @@
 
 import dev.architectury.hooks.fluid.forge.FluidStackHooksForge;
 import dev.latvian.mods.kubejs.item.ItemPredicate;
-import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
 import dev.latvian.mods.kubejs.recipe.viewer.RecipeViewerEntryType;
 import dev.latvian.mods.kubejs.script.KubeJSContext;
 import dev.latvian.mods.rhino.Context;
@@ -20,7 +19,7 @@
 
 import java.util.Arrays;
 
-public class REIIntegration implements KubeJSPlugin {
+public class REIIntegration {
 	// TODO: Re-add RVEType -> EntryType remapping registry
 
 	@Nullable

diff --git a/src/main/java/dev/latvian/mods/kubejs/item/ChancedIngredient.java b/src/main/java/dev/latvian/mods/kubejs/item/ChancedIngredient.java
@@ -4,6 +4,7 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponent;
+import dev.latvian.mods.kubejs.recipe.component.SimpleRecipeComponent;
 import dev.latvian.mods.rhino.type.TypeInfo;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -14,8 +15,6 @@
 import net.minecraft.world.item.crafting.Ingredient;
 
 public record ChancedIngredient(Ingredient ingredient, int count, FloatProvider chance) {
-	public static final TypeInfo TYPE_INFO = TypeInfo.of(ChancedIngredient.class);
-
 	public static final MapCodec<ChancedIngredient> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
 		Ingredient.CODEC.fieldOf("ingredient").forGetter(ChancedIngredient::ingredient),
 		Codec.INT.optionalFieldOf("count", 1).forGetter(ChancedIngredient::count),
@@ -29,17 +28,7 @@ public record ChancedIngredient(Ingredient ingredient, int count, FloatProvider
 		ChancedIngredient::new
 	);
 
-	public static final RecipeComponent<ChancedIngredient> RECIPE_COMPONENT = new RecipeComponent<>() {
-		@Override
-		public Codec<ChancedIngredient> codec() {
-			return ChancedIngredient.CODEC.codec();
-		}
-
-		@Override
-		public TypeInfo typeInfo() {
-			return TYPE_INFO;
-		}
-	};
+	public static final RecipeComponent<ChancedIngredient> RECIPE_COMPONENT = new SimpleRecipeComponent<>("chanced_ingredient", CODEC.codec(), TypeInfo.of(ChancedIngredient.class));
 
 	public boolean test(RandomSource random) {
 		return random.nextFloat() < chance.sample(random);

diff --git a/src/main/java/dev/latvian/mods/kubejs/item/ChancedItem.java b/src/main/java/dev/latvian/mods/kubejs/item/ChancedItem.java
@@ -1,9 +1,9 @@
 package dev.latvian.mods.kubejs.item;
 
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.latvian.mods.kubejs.recipe.component.RecipeComponent;
+import dev.latvian.mods.kubejs.recipe.component.SimpleRecipeComponent;
 import dev.latvian.mods.rhino.type.TypeInfo;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
@@ -14,8 +14,6 @@
 import net.minecraft.world.item.ItemStack;
 
 public record ChancedItem(ItemStack item, FloatProvider chance) {
-	public static final TypeInfo TYPE_INFO = TypeInfo.of(ChancedItem.class);
-
 	public static final MapCodec<ChancedItem> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
 		ItemStack.CODEC.fieldOf("item").forGetter(ChancedItem::item),
 		FloatProvider.CODEC.optionalFieldOf("chance", ConstantFloat.of(1F)).forGetter(ChancedItem::chance)
@@ -27,17 +25,7 @@ public record ChancedItem(ItemStack item, FloatProvider chance) {
 		ChancedItem::new
 	);
 
-	public static final RecipeComponent<ChancedItem> RECIPE_COMPONENT = new RecipeComponent<>() {
-		@Override
-		public Codec<ChancedItem> codec() {
-			return ChancedItem.CODEC.codec();
-		}
-
-		@Override
-		public TypeInfo typeInfo() {
-			return TYPE_INFO;
-		}
-	};
+	public static final RecipeComponent<ChancedItem> RECIPE_COMPONENT = new SimpleRecipeComponent<>("chanced_item", CODEC.codec(), TypeInfo.of(ChancedItem.class));
 
 	public boolean test(RandomSource random) {
 		return random.nextFloat() < chance.sample(random);

diff --git a/src/main/resources/kubejs.plugins.txt b/src/main/resources/kubejs.plugins.txt
@@ -1,6 +1,4 @@
 dev.latvian.mods.kubejs.BuiltinKubeJSPlugin
 dev.latvian.mods.kubejs.client.BuiltinKubeJSClientPlugin client
 dev.latvian.mods.kubejs.integration.architectury.ArchitecturyIntegration architectury
-dev.latvian.mods.kubejs.integration.gamestages.GameStagesIntegration gamestages
-dev.latvian.mods.kubejs.integration.jei.JEIIntegration jei
-dev.latvian.mods.kubejs.integration.rei.REIIntegration roughlyenoughitems
+dev.latvian.mods.kubejs.integration.gamestages.GameStagesIntegration gamestages