Skip to content

Commit 07901a5

Browse files
Circulate233Circulate233
committed
细节修复
1 parent 4035a80 commit 07901a5

File tree

7 files changed

+57
-77
lines changed

7 files changed

+57
-77
lines changed

‎build.gradle‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -208,48 +208,6 @@ dependencies {
208208
annotationProcessor("org.jetbrains:annotations:24.1.0")
209209
compileOnly("org.projectlombok:lombok:1.18.24")
210210
annotationProcessor("org.projectlombok:lombok:1.18.24")
211-
212-
implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
213-
implementation(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
214-
runtimeOnly(rfg.deobf("curse.maven:Cucumber-1.12.2-1.1.3-272335:2645867"))
215-
implementation(rfg.deobf("curse.maven:CodeChickenLib-1.12.2-3.2.4.1-universal-242818:2779848"))
216-
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
217-
implementation(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7336029"))
218-
compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
219-
implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
220-
implementation(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
221-
implementation(rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:5778512"))
222-
implementation(rfg.deobf("curse.maven:libnine-322344:3509087"))
223-
implementation(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
224-
implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
225-
implementation(rfg.deobf("curse.maven:extended-crafting-terminals-for-applied-1157825:6895322"))
226-
implementation(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
227-
implementation(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
228-
implementation(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
229-
implementation(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
230-
compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
231-
compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:5351260"))
232-
compileOnly(rfg.deobf("curse.maven:mekeng-1027681:5775101"))
233-
implementation(rfg.deobf("curse.maven:had-enough-items-557549:7340288"))
234-
implementation(rfg.deobf("curse.maven:thaumic-223628:2629023"))
235-
implementation(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
236-
implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
237-
implementation(rfg.deobf('curse.maven:ftb-library-237167:2985811'))
238-
implementation(rfg.deobf('curse.maven:ftb-utilities-237102:3157548'))
239-
implementation(rfg.deobf("curse.maven:botania-225643:3330934"))
240-
compileOnly rfg.deobf("curse.maven:Shulker-Tooltip-292899:3321356")
241-
implementation(rfg.deobf("curse.maven:ex-pattern-provider-892005:4773929"))
242-
compileOnly(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
243-
compileOnly(rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371"))
244-
compileOnly(rfg.deobf("curse.maven:extracpus-408089:3479639"))
245-
implementation(rfg.deobf("curse.maven:jei-utilities-616190:6937116"))
246-
implementation(rfg.deobf("curse.maven:brandons-core-231382:3408276"))
247-
implementation(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
248-
implementation(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
249-
implementation(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
250-
implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
251-
252-
compileOnly(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
253211
}
254212

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

‎gradle/scripts/dependencies.gradle‎

Lines changed: 40 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,45 @@ dependencies {
3434
// Include OSXNarratorBlocker by default for the dev env, for M1+ Macs
3535
runtimeOnly 'com.cleanroommc:osxnarratorblocker:1.0'
3636

37-
// Example - Dependency descriptor:
38-
// 'com.google.code.gson:gson:2.8.6' << group: com.google.code.gson, name:gson, version:2.8.6
39-
// 'group:name:version:classifier' where classifier is optional
37+
compileOnly("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
38+
compileOnly(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436"))
39+
runtimeOnly(rfg.deobf("curse.maven:Cucumber-1.12.2-1.1.3-272335:2645867"))
40+
compileOnly(rfg.deobf("curse.maven:CodeChickenLib-1.12.2-3.2.4.1-universal-242818:2779848"))
41+
compileOnly(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
42+
compileOnly(rfg.deobf("curse.maven:ae2fluidcraft-rework-unofficial-1404390:7336029"))
43+
compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
44+
compileOnly(rfg.deobf("curse.maven:baubles-227083:2518667"))
45+
compileOnly(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
46+
compileOnly(rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:5778512"))
47+
compileOnly(rfg.deobf("curse.maven:libnine-322344:3509087"))
48+
compileOnly(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
49+
compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
50+
compileOnly(rfg.deobf("curse.maven:extended-crafting-terminals-for-applied-1157825:6895322"))
51+
compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
52+
compileOnly(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
53+
compileOnly(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
54+
compileOnly(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
55+
compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
56+
compileOnly(rfg.deobf("curse.maven:mekanism-ce-399904:5351260"))
57+
compileOnly(rfg.deobf("curse.maven:mekeng-1027681:5775101"))
58+
compileOnly(rfg.deobf("curse.maven:had-enough-items-557549:7340288"))
59+
compileOnly(rfg.deobf("curse.maven:thaumic-223628:2629023"))
60+
compileOnly(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
61+
compileOnly(rfg.deobf("curse.maven:nae2-884359:5380800"))
62+
compileOnly(rfg.deobf('curse.maven:ftb-library-237167:2985811'))
63+
compileOnly(rfg.deobf('curse.maven:ftb-utilities-237102:3157548'))
64+
compileOnly(rfg.deobf("curse.maven:botania-225643:3330934"))
65+
compileOnly rfg.deobf("curse.maven:Shulker-Tooltip-292899:3321356")
66+
compileOnly(rfg.deobf("curse.maven:ex-pattern-provider-892005:4773929"))
67+
compileOnly(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
68+
compileOnly(rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371"))
69+
compileOnly(rfg.deobf("curse.maven:extracpus-408089:3479639"))
70+
compileOnly(rfg.deobf("curse.maven:jei-utilities-616190:6937116"))
71+
compileOnly(rfg.deobf("curse.maven:brandons-core-231382:3408276"))
72+
compileOnly(rfg.deobf("curse.maven:draconic-evolution-223565:3431261"))
73+
compileOnly(rfg.deobf("curse.maven:packagedauto-308380:6932932"))
74+
compileOnly(rfg.deobf("curse.maven:ender-utilities-224320:2977010"))
75+
compileOnly(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
4076

41-
// Example - Deobfuscating dependencies:
42-
// rfg.deobf('curse.maven:had-enough-items-557549:4543375')
43-
// By wrapping a dependency descriptor in rfg.deobf() method call, the dependency is queued for deobfuscation
44-
// When deobfuscating, RFG respects the mapping_channel + mapping_version stated in gradle.properties
45-
46-
// Example - CurseMaven dependencies:
47-
// 'curse.maven:had-enough-items-557549:4543375' << had-enough-items = project slug, 557549 = project id, 4543375 = file id
48-
// Full documentation: https://cursemaven.com/
49-
50-
// Example - Modrinth dependencies:
51-
// 'maven.modrinth:jei:4.16.1.1000' << jei = project name, 4.16.1.1000 = file version
52-
// Full documentation: https://docs.modrinth.com/docs/tutorials/maven/
53-
54-
// Common dependency types (configuration):
55-
// implementation = dependency available at both compile time and runtime
56-
// runtimeOnly = runtime dependency
57-
// compileOnly = compile time dependency
58-
// annotationProcessor = annotation processing dependencies
59-
// embed = bundle dependencies into final output artifact (no relocation)
60-
61-
// Transitive dependencies:
62-
// (Dependencies that your dependency depends on)
63-
// If you wish to exclude transitive dependencies in the described dependencies
64-
// Use a closure as such:
65-
// implementation ('com.google.code.gson:gson:2.8.6') {
66-
// transitive = false
67-
// }
77+
compileOnly(rfg.deobf("curse.maven:botaniverse-944656:4945200"))
6878
}

‎src/main/java/com/circulation/random_complement/mixin/ae2/gui/MixinAEBaseGui.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.minecraft.client.renderer.GlStateManager;
1717
import net.minecraft.inventory.Container;
1818
import net.minecraft.inventory.Slot;
19+
import org.jetbrains.annotations.NotNull;
1920
import org.lwjgl.opengl.GL11;
2021
import org.spongepowered.asm.mixin.Mixin;
2122
import org.spongepowered.asm.mixin.Shadow;
@@ -49,6 +50,11 @@ public MixinAEBaseGui(Container inventorySlotsIn) {
4950
@Shadow(remap = false)
5051
protected abstract List<Slot> getInventorySlots();
5152

53+
@Shadow
54+
public void drawSlot(@NotNull Slot s) {
55+
super.drawSlot(s);
56+
}
57+
5258
@Unique
5359
public Set<IAEItemStack> r$getCraftablesCache() {
5460
return ObjectSets.emptySet();

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/gui/MixinGuiUltimateEncoder.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
import net.minecraft.client.resources.I18n;
2020
import net.minecraft.inventory.Container;
2121
import net.minecraft.inventory.Slot;
22+
import org.jetbrains.annotations.NotNull;
2223
import org.lwjgl.input.Mouse;
2324
import org.spongepowered.asm.mixin.Final;
25+
import org.spongepowered.asm.mixin.Intrinsic;
2426
import org.spongepowered.asm.mixin.Mixin;
2527
import org.spongepowered.asm.mixin.Shadow;
2628
import org.spongepowered.asm.mixin.Unique;
@@ -71,8 +73,8 @@ protected void actionPerformedMixin(GuiButton btn, CallbackInfo ci) {
7173
}
7274
}
7375

74-
@Inject(method = "drawSlot", at = @At(value = "HEAD"), remap = true)
75-
private void drawSlotFake(Slot slot, CallbackInfo ci) {
76+
@Intrinsic
77+
public void drawSlot(@NotNull Slot slot) {
7678
if (!this.randomComplement$craftableCache.isEmpty() && slot instanceof SlotFake slotFake) {
7779
if (!slotFake.shouldDisplay()) return;
7880
var item = slotFake.getDisplayStack();
@@ -82,6 +84,7 @@ private void drawSlotFake(Slot slot, CallbackInfo ci) {
8284
}
8385
}
8486
}
87+
super.drawSlot(slot);
8588
}
8689

8790
@Unique

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiExtendedFluidPatternTerminal.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.glodblock.github.client.client.gui.GuiExtendedFluidPatternTerminal;
77
import net.minecraft.inventory.Container;
88
import net.minecraft.inventory.Slot;
9+
import org.jetbrains.annotations.NotNull;
910
import org.spongepowered.asm.mixin.Intrinsic;
1011
import org.spongepowered.asm.mixin.Mixin;
1112

@@ -17,7 +18,7 @@ public MixinGuiExtendedFluidPatternTerminal(Container container) {
1718
}
1819

1920
@Intrinsic
20-
public void drawSlot(Slot slot) {
21+
public void drawSlot(@NotNull Slot slot) {
2122
if (slot.xPos < 0 || slot.yPos < 0) return;
2223
if (slot instanceof SlotFake slotFake) {
2324
if (!slotFake.shouldDisplay()) return;

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiFluidPatternTerminal.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.glodblock.github.client.client.gui.GuiFluidPatternTerminal;
77
import net.minecraft.inventory.Container;
88
import net.minecraft.inventory.Slot;
9+
import org.jetbrains.annotations.NotNull;
910
import org.spongepowered.asm.mixin.Intrinsic;
1011
import org.spongepowered.asm.mixin.Mixin;
1112

@@ -17,7 +18,7 @@ public MixinGuiFluidPatternTerminal(Container container) {
1718
}
1819

1920
@Intrinsic
20-
public void drawSlot(Slot slot) {
21+
public void drawSlot(@NotNull Slot slot) {
2122
if (slot.xPos < 0 || slot.yPos < 0) return;
2223
if (slot instanceof SlotFake slotFake) {
2324
if (!slotFake.shouldDisplay()) return;

‎src/main/java/com/circulation/random_complement/mixin/ae2fc/news/MixinGuiWirelessFluidPatternTerminal.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.glodblock.github.client.client.gui.GuiWirelessFluidPatternTerminal;
77
import net.minecraft.inventory.Container;
88
import net.minecraft.inventory.Slot;
9+
import org.jetbrains.annotations.NotNull;
910
import org.spongepowered.asm.mixin.Intrinsic;
1011
import org.spongepowered.asm.mixin.Mixin;
1112

@@ -17,7 +18,7 @@ public MixinGuiWirelessFluidPatternTerminal(Container container) {
1718
}
1819

1920
@Intrinsic
20-
public void drawSlot(Slot slot) {
21+
public void drawSlot(@NotNull Slot slot) {
2122
if (slot.xPos < 0 || slot.yPos < 0) return;
2223
if (slot instanceof SlotFake slotFake) {
2324
if (!slotFake.shouldDisplay()) return;

0 commit comments

Comments
 (0)