Skip to content

Commit 2718768

Browse files
committed
fix #7
1 parent 11233b1 commit 2718768

3 files changed

Lines changed: 19 additions & 51 deletions

File tree

build.gradle

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,24 +197,6 @@ dependencies {
197197
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
198198
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
199199
}
200-
201-
compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
202-
implementation(rfg.deobf("curse.maven:had-enough-items-557549:4810661"))
203-
compileOnly(rfg.deobf('curse.maven:packagedauto-308380:2977147')) // 1.0.3.14
204-
compileOnly(rfg.deobf('curse.maven:codechicken-lib-1-8-242818:2779848')) //ccl
205-
compileOnly(rfg.deobf('curse.maven:gregtech-ce-unofficial-557242:5121638')) // gt
206-
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
207-
compileOnly(rfg.deobf('curse.maven:dynamistics-383632:3056455')) // dy
208-
implementation(rfg.deobf('curse.maven:baubles-227083:2518667')) //baubles
209-
compileOnly(rfg.deobf("curse.maven:thaumic-223628:2629023"))
210-
compileOnly(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
211-
implementation(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
212-
implementation(rfg.deobf("curse.maven:mekanism-energistics-1027681:5389347")) //mekeng
213-
compileOnly(rfg.deobf('curse.maven:opencomputers-223008:4630537')) //oc
214-
compileOnly(rfg.deobf("curse.maven:p455w0rdslib-255232:2830265"))
215-
compileOnly(rfg.deobf("curse.maven:ae2wtlib-304024:2830114"))
216-
compileOnly(rfg.deobf("curse.maven:wireless-crafting-terminal-244559:2830252"))//wct
217-
implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
218200
}
219201

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

gradle/scripts/dependencies.gradle

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,21 @@ 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
40-
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-
// }
37+
compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:7306619"))
38+
implementation(rfg.deobf("curse.maven:had-enough-items-557549:4810661"))
39+
compileOnly(rfg.deobf('curse.maven:packagedauto-308380:2977147')) // 1.0.3.14
40+
compileOnly(rfg.deobf('curse.maven:codechicken-lib-1-8-242818:2779848')) //ccl
41+
compileOnly(rfg.deobf('curse.maven:gregtech-ce-unofficial-557242:5121638')) // gt
42+
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
43+
compileOnly(rfg.deobf('curse.maven:dynamistics-383632:3056455')) // dy
44+
implementation(rfg.deobf('curse.maven:baubles-227083:2518667')) //baubles
45+
compileOnly(rfg.deobf("curse.maven:thaumic-223628:2629023"))
46+
compileOnly(rfg.deobf("curse.maven:thaumic-energistics-extended-life-849094:6321322"))
47+
implementation(rfg.deobf("curse.maven:mekanism-ce-399904:4804509")) //mek-ce
48+
implementation(rfg.deobf("curse.maven:mekanism-energistics-1027681:5389347")) //mekeng
49+
compileOnly(rfg.deobf('curse.maven:opencomputers-223008:4630537')) //oc
50+
compileOnly(rfg.deobf("curse.maven:p455w0rdslib-255232:2830265"))
51+
compileOnly(rfg.deobf("curse.maven:ae2wtlib-304024:2830114"))
52+
compileOnly(rfg.deobf("curse.maven:wireless-crafting-terminal-244559:2830252"))//wct
53+
implementation(rfg.deobf("curse.maven:ae2-crafting-tree-legacy-1121489:5814089"))
6854
}

src/main/java/com/glodblock/github/integration/jei/ExtendedFluidPatternTerminalRecipeTransferHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.glodblock.github.FluidCraft;
44
import com.glodblock.github.client.container.ContainerExtendedFluidPatternTerminal;
5-
import com.glodblock.github.common.part.PartExtendedFluidPatternTerminal;
5+
import com.glodblock.github.interfaces.FCFluidPatternPart;
66
import com.glodblock.github.network.CPacketLoadPattern;
77
import com.glodblock.github.util.NameConst;
88
import mezz.jei.api.gui.IRecipeLayout;
@@ -32,7 +32,7 @@ public IRecipeTransferError transferRecipe(@Nonnull final ContainerExtendedFluid
3232
return new RecipeTransferErrorTooltip(I18n.format(NameConst.TT_CRAFTING_RECIPE_ONLY));
3333
}
3434

35-
if (doTransfer && container.part instanceof PartExtendedFluidPatternTerminal) {
35+
if (doTransfer && container.part instanceof FCFluidPatternPart) {
3636
final RecipeTransferBuilder transfer = new RecipeTransferBuilder(
3737
recipeLayout)
3838
.clearEmptySlot(true)

0 commit comments

Comments
 (0)