fixed some compile errors

GregTech-Intergalactical · Oct 26, 2024 · d49bdd5 · d49bdd5
1 parent 30b6f8f
commit d49bdd5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/recipe/IRecipe.java b/common/src/main/java/muramasa/antimatter/recipe/IRecipe.java
@@ -75,9 +75,11 @@ public interface IRecipe extends net.minecraft.world.item.crafting.Recipe<Contai
 
     long getPower();
 
-    int @Nullable [] getOutputChances();
+    @Nullable
+    int[] getOutputChances();
 
-    int @Nullable [] getInputChances();
+    @Nullable
+    int[] getInputChances();
 
     default long getTotalPower(){
         return getDuration() * getPower();

diff --git a/common/src/main/resources/antimatter.accesswidener b/common/src/main/resources/antimatter.accesswidener
@@ -17,4 +17,6 @@ accessible method net/minecraft/world/item/crafting/ShapedRecipe patternFromJson
 accessible method net/minecraft/world/item/crafting/ShapedRecipe keyFromJson (Lcom/google/gson/JsonObject;)Ljava/util/Map;
 accessible method net/minecraft/world/item/crafting/ShapedRecipe matches (Lnet/minecraft/world/inventory/CraftingContainer;IIZ)Z
 accessible method net/minecraft/world/item/context/UseOnContext <init> (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/phys/BlockHitResult;)V
-accessible method net/minecraft/world/item/context/UseOnContext getHitResult ()Lnet/minecraft/world/phys/BlockHitResult;
+accessible method net/minecraft/world/item/context/UseOnContext getHitResult ()Lnet/minecraft/world/phys/BlockHitResult;
+accessible class net/minecraft/client/gui/screens/MenuScreens$ScreenConstructor
+accessible class net/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -57,7 +57,7 @@ dependencies{
     modImplementation(include("dev.trinsdar:arrp:0.6.7"))
     modCompileOnly("com.blamejared.crafttweaker:CraftTweaker-fabric-1.18.2:${rootProject.crafttweaker_version}")
     modCompileOnly(include("dev.trinsdar:ct-fabric-fluid-support:1.0.2"))
-    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
+    modImplementation "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
     modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}"){
         exclude(group: "mezz.jei", module: "jei-1.18.2-fabric-api")
     }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -100,7 +100,13 @@ dependencies {
         jarJar.ranged(it, "[1.18.2-1.2.6,)")
     }
     implementation fg.deobf("dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}")
+    implementation fg.deobf("dev.latvian.mods:rhino-forge:${rootProject.rhino_version}")
+    implementation fg.deobf("dev.architectury:architectury-forge:${rootProject.architectury_version}")
     implementation fg.deobf("curse.maven:the-one-probe-245211:${rootProject.top_forge_file}")
+    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
+    implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1")) {
+        jarJar.ranged(it, "[0.4.1,)")
+    }
     //include("org.jetbrains.kotlin:kotlin-reflect:${kotlin.coreLibrariesVersion}")
     //include("org.jetbrains.kotlin:kotlin-stdlib:${kotlin.coreLibrariesVersion}")
     //include("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin.coreLibrariesVersion}")

diff --git a/gradle.properties b/gradle.properties
@@ -15,6 +15,8 @@ fabric_loader_version=0.15.11
 jei_version=10.2.1.1004
 crafttweaker_version=9.1.90
 kubejs_version=1802.5.1-build.329
+rhino_version=1802.2.1-build.255
+architectury_version=4.12.94
 nightconfig_version=3.6.5
 rei_version=8.3.557
 mod_menu_version=3.1.0