KrystalCraft?

TonimatasDEV · Aug 9, 2024 · 76166a0 · 76166a0
1 parent e3143f8
commit 76166a0
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ allprojects {
     apply(plugin = "java")
 
     version = modVersion
-    group = "dev.tonimatas.krystalcraft"
+    group = "dev.tonimatas"
 
     repositories {
         maven(url = "https://maven.blamejared.com")

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -11,8 +11,8 @@ dependencies {
     modApi("com.teamresourceful.resourcefullib:resourcefullib-common-$minecraftVersion:$resourcefullibVersion")
     //modApi("earth.terrarium.botarium:botarium-common-$minecraftVersion:$botariumVersion")
 
-    //modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
-    //modRuntimeOnly("mezz.jei:jei-$minecraftVersion-common:$jeiVersion")
+    modCompileOnly("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
+    modRuntimeOnly("mezz.jei:jei-$minecraftVersion-common:$jeiVersion")
     //modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion")
     //modCompileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin:$reiVersion")
 }

diff --git a/...n/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CombiningStationRecipeCategory.java b/...n/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CombiningStationRecipeCategory.java
@@ -21,7 +21,7 @@
 
 
 public class CombiningStationRecipeCategory implements IRecipeCategory<CombiningRecipe> {
-    public final static ResourceLocation TEXTURE = new ResourceLocation(KrystalCraft.MOD_ID, "textures/gui/combining_station.png");
+    public final static ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(KrystalCraft.MOD_ID, "textures/gui/combining_station.png");
     private final IDrawable background;
     private final IDrawable icon;
 

diff --git a/...on/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CrushingStationRecipeCategory.java b/...on/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CrushingStationRecipeCategory.java
@@ -1,6 +1,6 @@
 package dev.tonimatas.krystalcraft.compat.jei;
 
-/*
+
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
@@ -20,7 +20,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class CrushingStationRecipeCategory implements IRecipeCategory<CrushingRecipe> {
-    public final static ResourceLocation TEXTURE = new ResourceLocation(KrystalCraft.MOD_ID, "textures/gui/crushing_station.png");
+    public final static ResourceLocation TEXTURE = ResourceLocation.fromNamespaceAndPath(KrystalCraft.MOD_ID, "textures/gui/crushing_station.png");
     private final IDrawable background;
     private final IDrawable icon;
 
@@ -56,4 +56,3 @@ public void setRecipe(IRecipeLayoutBuilder builder, CrushingRecipe recipe, IFocu
         builder.addSlot(RecipeIngredientRole.OUTPUT, 133, 34).addItemStack(recipe.result());
     }
 }
-*/
diff --git a/common/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CuttingStationRecipeCategory.java b/common/src/main/java/dev/tonimatas/krystalcraft/compat/jei/CuttingStationRecipeCategory.java
@@ -1,6 +1,6 @@
 package dev.tonimatas.krystalcraft.compat.jei;
 
-/*
+
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
@@ -22,7 +22,7 @@ public class CuttingStationRecipeCategory implements IRecipeCategory<CuttingReci
     private final IDrawable icon;
 
     public CuttingStationRecipeCategory(IGuiHelper helper) {
-        this.background = helper.createDrawable(new ResourceLocation(KrystalCraft.MOD_ID, "textures/gui/cutting_station.png"), 0, 0, 176, 85);
+        this.background = helper.createDrawable(ResourceLocation.fromNamespaceAndPath(KrystalCraft.MOD_ID, "textures/gui/cutting_station.png"), 0, 0, 176, 85);
         this.icon = helper.createDrawableIngredient(VanillaTypes.ITEM_STACK, new ItemStack(ModBlocks.CUTTING_STATION.get()));
     }
 
@@ -52,4 +52,3 @@ public void setRecipe(IRecipeLayoutBuilder builder, CuttingRecipe recipe, IFocus
         builder.addSlot(RecipeIngredientRole.OUTPUT, 80, 60).addItemStack(recipe.result());
     }
 }
-*/
diff --git a/common/src/main/java/dev/tonimatas/krystalcraft/compat/jei/JEIKrystalCraftModPlugin.java b/common/src/main/java/dev/tonimatas/krystalcraft/compat/jei/JEIKrystalCraftModPlugin.java
@@ -1,6 +1,6 @@
 package dev.tonimatas.krystalcraft.compat.jei;
 
-/*
+
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.recipe.RecipeType;
@@ -27,7 +27,7 @@ public class JEIKrystalCraftModPlugin implements IModPlugin {
 
     @Override
     public @NotNull ResourceLocation getPluginUid() {
-        return new ResourceLocation(KrystalCraft.MOD_ID, "jei_plugin");
+        return ResourceLocation.fromNamespaceAndPath(KrystalCraft.MOD_ID, "jei_plugin");
     }
 
     @Override
@@ -46,4 +46,3 @@ public void registerRecipes(IRecipeRegistration registration) {
         registration.addRecipes(COMBINING, level.getRecipeManager().getAllRecipesFor(ModRecipes.COMBINING.get()).stream().map(RecipeHolder::value).toList());
     }
 }
-*/
diff --git a/common/src/main/java/dev/tonimatas/krystalcraft/item/ModArmorTier.java b/common/src/main/java/dev/tonimatas/krystalcraft/item/ModArmorTier.java
@@ -4,6 +4,7 @@
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.ArmorMaterial;
+import net.minecraft.world.item.ArmorMaterials;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
 import dev.tonimatas.krystalcraft.KrystalCraft;

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ resourcefullibVersion=3.0.0
 resourcefullibRange=3.0
 
 # To update
-jeiVersion=17.3.0.49
+jeiVersion=19.8.2.99
 botariumVersion=3.2.2
 botariumRange=3
 
@@ -18,7 +18,7 @@ minecraftVersion=1.21
 # Fabric Properties
 fabricLoaderVersion=0.15.7
 fabricLoaderRange=>=0.14.0
-fabricApiVersion=0.96.11
+fabricApiVersion=0.102.0
 
 # NeoForge Properties
 neoforgeVersion=21.0.5-beta

diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -44,8 +44,8 @@ dependencies {
     modApi("com.teamresourceful.resourcefullib:resourcefullib-neoforge-$minecraftVersion:$resourcefullibVersion")
     //modApi("earth.terrarium.botarium:botarium-neoforge-$minecraftVersion:$botariumVersion")
 
-    //modCompileOnly("mezz.jei:jei-$minecraftVersion-neoforge-api:$jeiVersion")
-    //modLocalRuntime("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false }
+    modCompileOnly("mezz.jei:jei-$minecraftVersion-neoforge-api:$jeiVersion")
+    modLocalRuntime("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false }
 
     common(project(path = ":common", configuration = "namedElements")) { isTransitive = false }
     shadowCommon(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false }