Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 34 additions & 34 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,50 +37,50 @@
def asmVersion = "9.7"

dependencies {
implementation("com.github.GTNewHorizons:StructureLib:1.4.23:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
implementation("com.github.GTNewHorizons:ModularUI:1.2.20:dev")
implementation("com.github.GTNewHorizons:ModularUI2:2.2.18-1.7.10:dev")
implementation("com.github.GTNewHorizons:StructureLib:1.4.24:dev")
implementation("com.github.GTNewHorizons:GTNHLib:0.8.32:dev")
implementation("com.github.GTNewHorizons:ModularUI:1.3.1:dev")
implementation("com.github.GTNewHorizons:ModularUI2:2.3.23-1.7.10:dev")

compileOnly("com.github.GTNewHorizons:ae2stuff:0.9.8-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-690-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ArchitectureCraft:1.11.5") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.75:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.9.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ae2stuff:0.10.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-754-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ArchitectureCraft:1.12.3") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.78:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.9.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:bdlib:1.11.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.7:dev") { transitive = false }
compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderIO:2.9.26:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderStorage:1.7.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:FloodLights:1.5.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.02:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.108:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderIO:2.10.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderStorage:1.8.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:FloodLights:1.5.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.140:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.25:dev") { transitive = false }
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false }
compileOnly("curse.maven:mekanism-268560:2475797") { transitive = false }
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.19-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:OpenComputers:1.12.8-GTNH:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:waila:1.9.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:waila:1.9.15:dev") { transitive = false }

compileOnly rfg.deobf("maven.modrinth:immibis-microblocks:59.1.2")
compileOnly rfg.deobf("maven.modrinth:immibis-core:59.1.4")

runtimeOnlyNonPublishable("com.github.GTNewHorizons:ae2stuff:0.9.8-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ArchitectureCraft:1.11.5")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:1.0.0-beta57:dev')
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-690-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Avaritia:1.75:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Avaritiaddons:1.9.1-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.9.26:dev')
runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderStorage:1.7.7:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.02:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:FloodLights:1.5.4:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.108:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ae2stuff:0.10.2-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ArchitectureCraft:1.12.3")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:1.0.0-beta68a:dev')
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-754-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Avaritia:1.78:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Avaritiaddons:1.9.3-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.0:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.10.8:dev')
runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderStorage:1.8.0:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.140:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:FloodLights:1.5.5:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.25:dev")
runtimeOnlyNonPublishable("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev")
runtimeOnlyNonPublishable("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WanionLib:1.10.0:dev")

Expand All @@ -105,7 +105,7 @@ project.getConfigurations()
final DependencySubstitutions ds = c.getResolutionStrategy()
.getDependencySubstitution();
ds.substitute(ds.module("com.github.GTNewHorizons:Baubles"))
.using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH"))
.using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH"))
.withClassifier("dev")
.because("Baubles-Expanded replaces Baubles");
});
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import appeng.api.definitions.IItemDefinition;
import appeng.api.storage.ICellWorkbenchItem;
import appeng.parts.automation.UpgradeInventory;
import appeng.tile.inventory.IAEStackInventory;

import com.recursive_pineapple.matter_manipulator.common.building.IPseudoInventory;
import com.recursive_pineapple.matter_manipulator.common.building.PortableItemStack;
Expand Down Expand Up @@ -42,14 +43,16 @@ public static AECellItemProvider fromWorkbenchItem(ItemStack stack) {
cell.mCell = new PortableItemStack(stack);
IInventory upgrades = item.getUpgradesInventory(stack);
cell.mUpgrades = upgrades == null ? null : MMUtils.fromInventory(upgrades);
IInventory config = item.getConfigInventory(stack);
IAEStackInventory config = item.getConfigAEInventory(stack);
cell.mConfig = config == null ? null : MMUtils.fromInventoryNoMerge(config);
cell.mFuzzyMode = switch (item.getFuzzyMode(stack)) {
case IGNORE_ALL -> 0;
case PERCENT_25 -> 1;
case PERCENT_50 -> 2;
case PERCENT_75 -> 3;
case PERCENT_99 -> 4;
case PERCENT_10 -> 5;
case PERCENT_1 -> 6;
};

IItemDefinition oredictCard = AEApi.instance()
Expand Down Expand Up @@ -120,6 +123,8 @@ public ItemStack getStack(IPseudoInventory inv, boolean consume) {
case 2 -> FuzzyMode.PERCENT_50;
case 3 -> FuzzyMode.PERCENT_75;
case 4 -> FuzzyMode.PERCENT_99;
case 5 -> FuzzyMode.PERCENT_10;
case 6 -> FuzzyMode.PERCENT_1;
default -> FuzzyMode.IGNORE_ALL;
});

Expand Down
Loading