Skip to content

Commit e824fc1

Browse files
Circulate233Circulate233
committed
修复mixin
1 parent bf13ca7 commit e824fc1

3 files changed

Lines changed: 105 additions & 94 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ sourceSets {
113113
}
114114
}
115115

116-
def mixinConfigFiles = fileTree('src/main/resources') {
117-
include 'mixins.novaeng_core.json'
118-
}.files.collect { it.name }.sort()
119-
120116
String remapTaskName = propertyBool('enable_shadow') ? 'remapShadowJar' : 'remapJar'
121117

122118
unimined.minecraft {
@@ -133,7 +129,7 @@ unimined.minecraft {
133129
loader '0.5.6-alpha'
134130
runs.auth.username = minecraft_username
135131
runs.all {
136-
systemProperty('crl.dev.mixin', mixinConfigFiles.join(','))
132+
systemProperty('crl.dev.mixin', 'mixins.novaeng_core.json,mixins.novaeng_core.mod.json')
137133
def extraArgs = propertyString('extra_jvm_args')
138134
if (extraArgs != null && !extraArgs.trim().isEmpty()) {
139135
jvmArgs += extraArgs.split(/\s+/).toList()
@@ -240,7 +236,7 @@ jar {
240236
manifest {
241237
def attributeMap = [
242238
'ModType' : 'CRL',
243-
'MixinConfigs': mixinConfigFiles.join(',')
239+
'MixinConfigs': 'mixins.novaeng_core.json,mixins.novaeng_core.mod.json'
244240
]
245241
if (configurations.contain.size() > 0) {
246242
attributeMap['ContainedDeps'] = configurations.contain.collect { it.name }.join(' ')

‎src/main/resources/mixins.novaeng_core.json‎

Lines changed: 2 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -9,105 +9,19 @@
99
},
1010
"compatibilityLevel": "JAVA_25",
1111
"client": [
12-
"ae2.AccessorGuiCraftConfirm",
13-
"ae2.MixinAppEngClientPacketHandler",
14-
"ae2.MixinGuiCraftConfirm",
15-
"ae2.MixinGuiCraftingStatus",
16-
"ae2.MixinGuiPatternTerm",
17-
"astralsorcery.AccessorResearchManager",
18-
"astralsorcery.InvokerPerkEffectHelper",
19-
"botania.MixinClientProxy",
20-
"ic2.MixinNetworkManagerClient",
21-
"jei.MixinInputHandler",
22-
"jetif.MixinCompatFluxNetworks",
23-
"legendarytooltips.MixinTooltipDecor",
2412
"minecraft.AccessorParticleManager",
2513
"minecraft.MixinBlockColors",
2614
"minecraft.MixinFontRenderer",
2715
"minecraft.MixinGuiScreen",
2816
"minecraft.MixinItemColors",
2917
"minecraft.MixinNetHandlerPlayClient",
3018
"minecraft.MixinNettyCompressionDecoder",
31-
"minecraft.forge.MixinForgeHooksClient",
32-
"mmce.MixinIngredientItemStackRenderer",
33-
"modularrouters.MixinClientProxy",
34-
"opticheck.MixinOptiCheckScreen",
35-
"packagedauto.MixinGuiUnpackager"
36-
],
37-
"server": [
38-
"ae2.MixinPacketInventoryAction",
39-
"astralsorcery.MixinPlayerProgress",
40-
"codechickenlib.MixinReflectionManager",
41-
"draconicevolution.MixinEntityChaosGuardian",
42-
"immersiveengineering.MixinTileEntityExcavator"
19+
"minecraft.forge.MixinForgeHooksClient"
4320
],
4421
"mixins": [
45-
"ae2.AccessorAbstractCellInventory",
46-
"ae2.AccessorCellRegistry",
47-
"ae2.AccessorContainerCraftConfirm",
48-
"ae2.AccessorContainerPatternEncoder",
49-
"ae2.AccessorCraftingCPURecord",
50-
"ae2.MixinAppEngServerPacketHandler",
51-
"ae2.MixinCraftingCPUCluster",
52-
"ae2.MixinCraftingCPUClusterTwo",
53-
"ae2.MixinCraftingCPUClusterTwo$AccessorTaskProgress",
54-
"ae2.MixinCraftingCPUStatus",
55-
"ae2.MixinCraftingGridCache",
56-
"ae2.MixinGridStorageCache",
57-
"ae2.MixinTileChestFilter",
58-
"ae2.MixinTileDriveFilter",
59-
"ar.MixinDimensionProperties",
60-
"astralsorcery.MixinBlockCustomOre",
61-
"astralsorcery.MixinPlayerAttributeMap",
62-
"athenaeum.MixinEnchantmentHelper",
63-
"betterp2p.MixinServerLinkP2PHandler",
64-
"betterp2p.MixinServerUnlinkP2PHandler",
65-
"botania.MixinTileRedStringContainer",
66-
"botania.MixinTileRuneAltar",
67-
"botania_r.MixinSubTileDandelifeon",
68-
"botania_r.MixinSubTileEntropinnyum",
69-
"botania_r.MixinSubTileGenerating",
70-
"botania_r.MixinSubTileMunchdew",
71-
"botania_r.MixinSubTileNarslimmus",
72-
"cofh.MixinTypeEntry",
73-
"dme.MixinMetadataManager",
74-
"electroblobs.AccessorForfeit",
75-
"electroblobs.MixinForfeit",
76-
"enderio.MixinModInterferenceWarner",
77-
"extrabotany.MixinTileManaLiquefaction",
78-
"ic2.AccessorTileEntityInventory",
79-
"ic2.MixinBasicMachineRecipeManager",
80-
"ic2.MixinNetworkManager",
81-
"ic2.MixinTileEntityMatter",
82-
"ic2.MixinTileEntityReplicator",
83-
"libvulpes.MixinTileFluidHatch",
84-
"lootoverhaul.MixinConfigIdFileGenerator",
85-
"mets.MixinEntityTachyonBullet",
8622
"minecraft.MixinNettyPacketDecoder",
8723
"minecraft.MixinRecipeBookServer",
8824
"minecraft.forge.MixinFMLProxyPacket",
89-
"minecraft.forge.MixinSimpleIndexedCodec",
90-
"mmce.AccessorAbstractMachine",
91-
"mmce.MixinBlockArrayCache",
92-
"mmce.MixinBlockArrayPreviewRenderHelper",
93-
"mmce.MixinBlockArrayRenderHelper",
94-
"mmce.MixinCommonProxy",
95-
"mmce.MixinDynamicMachineRenderContext",
96-
"mmce.MixinMachineRecipe",
97-
"mmce.MixinMachineRegistry",
98-
"mmce.MixinMEPatternProvider",
99-
"mmce.MixinRecipeAdapterBuilder",
100-
"mmce.MixinTaskExecutor",
101-
"mmce.MixinTileMultiblockMachineController",
102-
"mmce.MixinWorldSceneRendererWidget",
103-
"nae2.MixinJEICellCategory",
104-
"nco.MixinFluidTileWrapper",
105-
"threng.MixinL9AspectInventory",
106-
"threng.MixinL9AspectSlot",
107-
"packagedauto.MixinPacketEjectTracker",
108-
"packagedauto.MixinTileBase",
109-
"psi.MixinPieceTrickExplode",
110-
"rftools.MixinBuilderTileEntity",
111-
"techguns.MixinItemRenderHack"
25+
"minecraft.forge.MixinSimpleIndexedCodec"
11226
]
11327
}

‎src/main/resources/mixins.novaeng_core.mod.json‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"package": "github.kasuminova.novaeng.mixin",
3+
"plugin": "github.kasuminova.novaeng.mixin.NovaEngCoreLateMixinLoader",
4+
"refmap": "mixins.novaeng_core.refmap.json",
5+
"target": "@env(MOD)",
6+
"minVersion": "0.8",
7+
"mixinextras": {
8+
"minVersion": "0.5.0"
9+
},
10+
"compatibilityLevel": "JAVA_25",
11+
"client": [
12+
"ae2.AccessorGuiCraftConfirm",
13+
"ae2.MixinAppEngClientPacketHandler",
14+
"ae2.MixinGuiCraftConfirm",
15+
"ae2.MixinGuiCraftingStatus",
16+
"ae2.MixinGuiPatternTerm",
17+
"botania.MixinClientProxy",
18+
"ic2.MixinNetworkManagerClient",
19+
"jei.MixinInputHandler",
20+
"jetif.MixinCompatFluxNetworks",
21+
"legendarytooltips.MixinTooltipDecor",
22+
"mmce.MixinIngredientItemStackRenderer",
23+
"modularrouters.MixinClientProxy",
24+
"opticheck.MixinOptiCheckScreen",
25+
"packagedauto.MixinGuiUnpackager"
26+
],
27+
"server": [
28+
"ae2.MixinPacketInventoryAction",
29+
"astralsorcery.AccessorResearchManager",
30+
"astralsorcery.InvokerPerkEffectHelper",
31+
"astralsorcery.MixinPlayerProgress",
32+
"codechickenlib.MixinReflectionManager",
33+
"draconicevolution.MixinEntityChaosGuardian",
34+
"immersiveengineering.MixinTileEntityExcavator"
35+
],
36+
"mixins": [
37+
"ae2.AccessorAbstractCellInventory",
38+
"ae2.AccessorCellRegistry",
39+
"ae2.AccessorContainerCraftConfirm",
40+
"ae2.AccessorContainerPatternEncoder",
41+
"ae2.AccessorCraftingCPURecord",
42+
"ae2.MixinAppEngServerPacketHandler",
43+
"ae2.MixinCraftingCPUCluster",
44+
"ae2.MixinCraftingCPUClusterTwo",
45+
"ae2.MixinCraftingCPUClusterTwo$AccessorTaskProgress",
46+
"ae2.MixinCraftingCPUStatus",
47+
"ae2.MixinCraftingGridCache",
48+
"ae2.MixinGridStorageCache",
49+
"ae2.MixinTileChestFilter",
50+
"ae2.MixinTileDriveFilter",
51+
"ar.MixinDimensionProperties",
52+
"astralsorcery.MixinBlockCustomOre",
53+
"astralsorcery.MixinPlayerAttributeMap",
54+
"athenaeum.MixinEnchantmentHelper",
55+
"betterp2p.MixinServerLinkP2PHandler",
56+
"betterp2p.MixinServerUnlinkP2PHandler",
57+
"botania.MixinTileRedStringContainer",
58+
"botania.MixinTileRuneAltar",
59+
"botania_r.MixinSubTileDandelifeon",
60+
"botania_r.MixinSubTileEntropinnyum",
61+
"botania_r.MixinSubTileGenerating",
62+
"botania_r.MixinSubTileMunchdew",
63+
"botania_r.MixinSubTileNarslimmus",
64+
"cofh.MixinTypeEntry",
65+
"dme.MixinMetadataManager",
66+
"electroblobs.AccessorForfeit",
67+
"electroblobs.MixinForfeit",
68+
"enderio.MixinModInterferenceWarner",
69+
"extrabotany.MixinTileManaLiquefaction",
70+
"ic2.AccessorTileEntityInventory",
71+
"ic2.MixinBasicMachineRecipeManager",
72+
"ic2.MixinNetworkManager",
73+
"ic2.MixinTileEntityMatter",
74+
"ic2.MixinTileEntityReplicator",
75+
"libvulpes.MixinTileFluidHatch",
76+
"lootoverhaul.MixinConfigIdFileGenerator",
77+
"mets.MixinEntityTachyonBullet",
78+
"mmce.AccessorAbstractMachine",
79+
"mmce.MixinBlockArrayCache",
80+
"mmce.MixinBlockArrayPreviewRenderHelper",
81+
"mmce.MixinBlockArrayRenderHelper",
82+
"mmce.MixinCommonProxy",
83+
"mmce.MixinDynamicMachineRenderContext",
84+
"mmce.MixinMachineRecipe",
85+
"mmce.MixinMachineRegistry",
86+
"mmce.MixinMEPatternProvider",
87+
"mmce.MixinRecipeAdapterBuilder",
88+
"mmce.MixinTaskExecutor",
89+
"mmce.MixinTileMultiblockMachineController",
90+
"mmce.MixinWorldSceneRendererWidget",
91+
"nae2.MixinJEICellCategory",
92+
"nco.MixinFluidTileWrapper",
93+
"threng.MixinL9AspectInventory",
94+
"threng.MixinL9AspectSlot",
95+
"packagedauto.MixinPacketEjectTracker",
96+
"packagedauto.MixinTileBase",
97+
"psi.MixinPieceTrickExplode",
98+
"rftools.MixinBuilderTileEntity",
99+
"techguns.MixinItemRenderHack"
100+
]
101+
}

0 commit comments

Comments
 (0)