Skip to content

Commit 3c76faf

Browse files
author
Circulate233
committed
我不知道发生了什么总之就是这样
1 parent 185dcdc commit 3c76faf

File tree

7 files changed

+75
-18
lines changed

7 files changed

+75
-18
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ dependencies {
292292
implementation(rfg.deobf("curse.maven:techguns-244201:2958103"))
293293
implementation(rfg.deobf("curse.maven:legendary-tooltips-532127:5734973"))
294294
implementation(rfg.deobf("curse.maven:betterer-p2p-943734:4928154"))
295+
implementation(rfg.deobf("curse.maven:Loot-Overhaul-299389:2711740"))
295296
implementation(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:6160826"))
296297
implementation(kotlin("stdlib-jdk8"))
297298
}

src/main/java/github/kasuminova/novaeng/mixin/NovaEngCoreLateMixinLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class NovaEngCoreLateMixinLoader implements ILateMixinLoader {
3636
addModdedMixinCFG("mixins.novaeng_core_avaritia.json","avaritia");
3737
addModdedMixinCFG("mixins.novaeng_core_betterp2p.json","betterp2p");
3838
addModdedMixinCFG("mixins.novaeng_core_nco.json","nuclearcraft");
39+
addModdedMixinCFG("mixins.novaeng_core_lootoverhaul.json","lootoverhaul");
3940
addMixinCFG("mixins.novaeng_core_forge_late.json");
4041
addMixinCFG("mixins.novaeng_core_dme.json",
4142
() -> Loader.isModLoaded("deepmoblearning") && Loader.instance().getIndexedModList().get("deepmoblearning").getName().equals("DeepMobEvolution"));
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package github.kasuminova.novaeng.mixin.lootoverhaul;
2+
3+
import com.tmtravlr.lootoverhaul.utilities.ConfigIdFileGenerator;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.injection.At;
6+
import org.spongepowered.asm.mixin.injection.Redirect;
7+
8+
import java.util.List;
9+
10+
@Mixin(value = ConfigIdFileGenerator.class,remap = false)
11+
public class MixinConfigIdFileGenerator {
12+
13+
/**
14+
* 我无法理解为什么会崩溃,我选择直接把它炸掉
15+
*/
16+
@Redirect(method = "generateIDFiles",at = @At(value = "INVOKE", target = "Ljava/util/Collections;sort(Ljava/util/List;)V"))
17+
private static void sortR(List<Object> list){
18+
19+
}
20+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package github.kasuminova.novaeng.mixin.minecraft;
2+
3+
import net.minecraft.client.gui.GuiListExtended;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.Shadow;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
10+
@Mixin(GuiListExtended.class)
11+
public abstract class MixinGuiListExtended {
12+
13+
@Inject(method = "updateItemPos",at = @At("HEAD"), cancellable = true)
14+
protected void updateItemPos(int entryID, int insideLeft, int yPos, float partialTicks, final CallbackInfo ci) {
15+
if (this.getListEntry(entryID) == null){
16+
ci.cancel();
17+
}
18+
}
19+
20+
@Shadow
21+
public abstract GuiListExtended.IGuiListEntry getListEntry(int index);
22+
}

src/main/java/github/kasuminova/novaeng/mixin/mmce/MixinRecipeAdapterBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import github.kasuminova.novaeng.common.util.NovaRAB;
44
import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeAdapterBuilder;
5+
import org.jetbrains.annotations.NotNull;
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.Unique;
7-
import stanhebben.zenscript.annotations.NotNull;
88

99
@Mixin(value = RecipeAdapterBuilder.class,remap = false)
1010
public class MixinRecipeAdapterBuilder implements NovaRAB {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"package": "github.kasuminova.novaeng.mixin.lootoverhaul",
3+
"refmap": "mixins.novaeng_core.refmap.json",
4+
"target": "@env(DEFAULT)",
5+
"minVersion": "0.8",
6+
"compatibilityLevel": "JAVA_8",
7+
"client": [
8+
],
9+
"mixins": [
10+
"MixinConfigIdFileGenerator"
11+
]
12+
}
Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
2-
"package": "github.kasuminova.novaeng.mixin.minecraft",
3-
"refmap": "mixins.novaeng_core.refmap.json",
4-
"target": "@env(DEFAULT)",
5-
"minVersion": "0.8",
6-
"compatibilityLevel": "JAVA_8",
7-
"mixins": [
8-
"MixinNettyPacketDecoder",
9-
"MixinRecipeBookServer",
10-
"forge.MixinSimpleIndexedCodec"
11-
],
12-
"client": [
13-
"AccessorParticleManager",
14-
"MixinFontRenderer",
15-
"MixinNetHandlerPlayClient",
16-
"MixinNettyCompressionDecoder",
17-
"forge.MixinForgeHooksClient"
18-
]
2+
"package": "github.kasuminova.novaeng.mixin.minecraft",
3+
"refmap": "mixins.novaeng_core.refmap.json",
4+
"target": "@env(DEFAULT)",
5+
"minVersion": "0.8",
6+
"compatibilityLevel": "JAVA_8",
7+
"mixins": [
8+
"MixinGuiListExtended",
9+
"MixinNettyPacketDecoder",
10+
"MixinRecipeBookServer",
11+
"forge.MixinSimpleIndexedCodec"
12+
],
13+
"client": [
14+
"AccessorParticleManager",
15+
"MixinFontRenderer",
16+
"MixinNetHandlerPlayClient",
17+
"MixinNettyCompressionDecoder",
18+
"forge.MixinForgeHooksClient"
19+
]
1920
}

0 commit comments

Comments
 (0)