Skip to content

Commit 32220a7

Browse files
committed
一些调整
1 parent 86eb7d2 commit 32220a7

File tree

5 files changed

+29
-2
lines changed

5 files changed

+29
-2
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ dependencies {
226226

227227
// Mod Dependencies
228228
implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
229+
implementation(rfg.deobf("curse.maven:jaopca-266936:3487112"))
229230
implementation(rfg.deobf("curse.maven:modularui-624243:7102461"))
230231
compileOnly(rfg.deobf("curse.maven:electroblobs-wizardry-265642:5354477"))
231232
implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))

src/main/java/github/kasuminova/novaeng/common/crafttweaker/expansion/RecipePrimerHyperNet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ object RecipePrimerHyperNet {
9393
RegistryHyperNet.getResearchCognitionData(it)
9494
}
9595
.filter { Objects.nonNull(it) }
96-
.toArray { arrayOf<ResearchCognitionData>() }
96+
.toArray { arrayOfNulls<ResearchCognitionData>(0) }
9797
)
9898
}
9999

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorWorker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ class EFabricatorWorker : EFabricatorPart() {
328328
}
329329

330330
constructor(nbt: NBTTagCompound, stackSet: MutableList<ItemStack>) {
331-
remaining = Array<ItemStack>(
331+
remaining = Array(
332332
nbt.getByte(REMAIN_SIZE_TAG).toInt()
333333
) { i -> ItemStack.EMPTY }
334334
for (remainIdx in remaining.indices) {
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package github.kasuminova.novaeng.mixin.ic2;
2+
3+
import com.llamalad7.mixinextras.sugar.Local;
4+
import ic2.api.recipe.IRecipeInput;
5+
import ic2.core.recipe.BasicMachineRecipeManager;
6+
import net.minecraft.item.ItemStack;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.Shadow;
9+
import org.spongepowered.asm.mixin.injection.At;
10+
import org.spongepowered.asm.mixin.injection.Redirect;
11+
12+
import java.util.Collection;
13+
import java.util.stream.Collectors;
14+
15+
@Mixin(value = BasicMachineRecipeManager.class,remap = false)
16+
public abstract class MixinBasicMachineRecipeManager {
17+
18+
@Shadow
19+
protected abstract void displayError(String msg);
20+
21+
@Redirect(method = "addRecipe(Lic2/api/recipe/IRecipeInput;Ljava/util/Collection;Lnet/minecraft/nbt/NBTTagCompound;Z)Z", at = @At(value = "INVOKE", target = "Lic2/core/recipe/BasicMachineRecipeManager;displayError(Ljava/lang/String;)V"))
22+
private void new$displayError(BasicMachineRecipeManager basicMachineRecipeManager, String string, @Local(name = "input") IRecipeInput input, @Local(name = "output") Collection<ItemStack> output) {
23+
this.displayError("Input ItemStack " + input.getInputs().stream().map(ItemStack::getDisplayName).collect(Collectors.toList()) + " ,output ItemStack " + output.stream().map(ItemStack::getDisplayName).collect(Collectors.toList()) + " is invalid.");
24+
}
25+
}

src/main/resources/mixins.novaeng_core_ic2.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
],
1010
"mixins": [
1111
"AccessorTileEntityInventory",
12+
"MixinBasicMachineRecipeManager",
1213
"MixinNetworkManager",
1314
"MixinTileEntityMatter",
1415
"MixinTileEntityReplicator"

0 commit comments

Comments
 (0)