Skip to content

Commit 2f089a6

Browse files
committed
修复bug
1 parent d857bb5 commit 2f089a6

File tree

5 files changed

+123
-22
lines changed

5 files changed

+123
-22
lines changed

.gitignore

Lines changed: 113 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,118 @@
1-
# eclipse
2-
bin
3-
*.launch
4-
.settings
5-
.metadata
6-
.classpath
7-
.project
8-
9-
# idea
10-
out
1+
# User-specific stuff
2+
.idea/
3+
.kotlin/
4+
5+
*.iml
116
*.ipr
127
*.iws
13-
*.iml
14-
.idea
158

16-
# gradle
17-
build
9+
# IntelliJ
10+
out/
11+
# mpeltonen/sbt-idea plugin
12+
.idea_modules/
13+
14+
# JIRA plugin
15+
atlassian-ide-plugin.xml
16+
17+
# Compiled class file
18+
*.class
19+
20+
# Log file
21+
*.log
22+
23+
# BlueJ files
24+
*.ctxt
25+
26+
# Package Files #
27+
*.war
28+
*.nar
29+
*.ear
30+
*.zip
31+
*.tar.gz
32+
*.rar
33+
34+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
35+
hs_err_pid*
36+
37+
*~
38+
39+
# temporary files which can be created if a process still has a handle open of a deleted file
40+
.fuse_hidden*
41+
42+
# KDE directory preferences
43+
.directory
44+
45+
# Linux trash folder which might appear on any partition or disk
46+
.Trash-*
47+
48+
# .nfs files are created when an open file is removed but is still being accessed
49+
.nfs*
50+
51+
# General
52+
.DS_Store
53+
.AppleDouble
54+
.LSOverride
55+
56+
# Icon must end with two \r
57+
Icon
58+
59+
# Thumbnails
60+
._*
61+
62+
# Files that might appear in the root of a volume
63+
.DocumentRevisions-V100
64+
.fseventsd
65+
.Spotlight-V100
66+
.TemporaryItems
67+
.Trashes
68+
.VolumeIcon.icns
69+
.com.apple.timemachine.donotpresent
70+
71+
# Directories potentially created on remote AFP share
72+
.AppleDB
73+
.AppleDesktop
74+
Network Trash Folder
75+
Temporary Items
76+
.apdisk
77+
78+
# Windows thumbnail cache files
79+
Thumbs.db
80+
Thumbs.db:encryptable
81+
ehthumbs.db
82+
ehthumbs_vista.db
83+
84+
# Dump file
85+
*.stackdump
86+
87+
# Folder config file
88+
[Dd]esktop.ini
89+
90+
# Recycle Bin used on file shares
91+
$RECYCLE.BIN/
92+
93+
# Windows Installer files
94+
*.cab
95+
*.msi
96+
*.msix
97+
*.msm
98+
*.msp
99+
100+
# Windows shortcuts
101+
*.lnk
102+
18103
.gradle
104+
build/
105+
run/
106+
107+
# Ignore Gradle GUI config
108+
gradle-app.setting
109+
110+
# Cache of project
111+
.gradletasknamecache
112+
113+
**/build/
114+
115+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
116+
!gradle-wrapper.jar
19117

20-
# other
21-
eclipse
22-
run
118+
gradle.properties

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ dependencies {
235235
implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
236236
implementation(rfg.deobf('curse.maven:ftb-library-237167:2985811'))
237237
implementation(rfg.deobf('curse.maven:ftb-utilities-237102:3157548'))
238-
compileOnly(rfg.deobf("curse.maven:botania-225643:3330934"))
238+
implementation(rfg.deobf("curse.maven:botania-225643:3330934"))
239239
compileOnly rfg.deobf("curse.maven:Shulker-Tooltip-292899:3321356")
240240
implementation(rfg.deobf("curse.maven:ex-pattern-provider-892005:4773929"))
241241
compileOnly(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
@@ -247,8 +247,7 @@ dependencies {
247247
implementation(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
248248
implementation(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
249249

250-
runtimeOnly("org.zeith.HammerLib:HammerLib-1.12.2:12.2.58")
251-
implementation(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
250+
compileOnly(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
252251
}
253252

254253
apply from: 'gradle/scripts/dependencies.gradle'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ show_testing_output = false
1616

1717
# Mod Information
1818
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
19-
mod_version = 1.7.10
19+
mod_version = 1.7.11
2020
root_package = com.circulation
2121
mod_id = random_complement
2222
mod_name = RandomComplement

src/main/java/com/circulation/random_complement/mixin/ae2/MixinPacketCraftRequest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.circulation.random_complement.mixin.ae2;
22

3+
import appeng.api.util.AEPartLocation;
4+
import appeng.container.ContainerOpenContext;
35
import appeng.container.implementations.ContainerCraftAmount;
46
import appeng.container.implementations.ContainerCraftConfirm;
57
import appeng.core.sync.AppEngPacket;
@@ -60,6 +62,10 @@ public void serverPacketData(@Nonnull EntityPlayer p, int slot, @Nonnull GuiBrid
6062
isBauble ? r$readBaubles(p, slot) : p.inventory.getStackInSlot(slot),
6163
p, slot, isBauble ? 1 : 0
6264
));
65+
var context = new ContainerOpenContext(null);
66+
context.setSide(AEPartLocation.INTERNAL);
67+
newContainer.setOpenContext(context);
68+
6369
entityPlayerMP.openContainer = newContainer;
6470
entityPlayerMP.openContainer.windowId = windowId;
6571

src/main/java/com/circulation/random_complement/mixin/botaniverse/MixinTileMorePool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import vazkii.botania.api.internal.IManaBurst;
88
import vazkii.botania.api.mana.IManaCollector;
99

10-
@Mixin(value = TileMorePool.class, remap = false)
10+
@Mixin(TileMorePool.class)
1111
public abstract class MixinTileMorePool implements IManaCollector {
1212

1313
@Shadow(remap = false)

0 commit comments

Comments
 (0)