Skip to content

Commit 86b67dc

Browse files
SirEdvinSirEdvin
committed
Update code to correctly work with new version of libs
1 parent d6d1255 commit 86b67dc

16 files changed

Lines changed: 27 additions & 27 deletions

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ mixinGradle = "0.7.+"
1010
forgegradle = "6.+"
1111
# Core mod dependencies
1212
cc-tweaked = "1.113.0"
13-
broccolium = "1.0.0-rc.6"
14-
tweakium = "1.0.0-rc.6"
15-
peripheralium = "1.0.0-rc.6"
13+
broccolium = "1.0.0-rc.8"
14+
tweakium = "1.0.0-rc.8"
15+
peripheralium = "1.0.0-rc.8"
1616
mixin = "0.8.5"
1717
# Fabric dependencies
1818
fabric-api = "0.92.0+1.20.1"

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/AutomataCoreFuelBoon.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package site.siredvin.turtlematic.computercraft
22

33
import site.siredvin.turtlematic.api.AutomataCoreTraits
44
import site.siredvin.turtlematic.api.IAutomataCoreTier
5-
import site.siredvin.tweakium.modules.peripheral.ability.TurtleFuelBoon
5+
import site.siredvin.tweakium.modules.peripheral.boon.TurtleFuelBoon
66
import site.siredvin.tweakium.modules.peripheral.owner.TurtlePeripheralOwner
77

88
class AutomataCoreFuelBoon(owner: TurtlePeripheralOwner, private val tier: IAutomataCoreTier) : TurtleFuelBoon(owner, tier.maxFuelConsumptionRate) {

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/AutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import site.siredvin.turtlematic.computercraft.operations.SphereOperation
99
import site.siredvin.turtlematic.computercraft.plugins.AutomataInteractionPlugin
1010
import site.siredvin.turtlematic.computercraft.plugins.AutomataItemSuckPlugin
1111
import site.siredvin.turtlematic.computercraft.plugins.AutomataLookPlugin
12-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
13-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
12+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
13+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
1414

1515
class AutomataCorePeripheral(
1616
turtle: ITurtleAccess,

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/BaseAutomataCorePeripheral.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import site.siredvin.turtlematic.computercraft.operations.SingleOperation
1212
import site.siredvin.turtlematic.computercraft.operations.SingleOperationContext
1313
import site.siredvin.turtlematic.util.DataStorageObjects
1414
import site.siredvin.tweakium.modules.peripheral.OwnedPeripheral
15-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
15+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
1616
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralCheck
1717
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralFunction
1818
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralOperation

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/EndAutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import site.siredvin.turtlematic.api.PeripheralConfiguration
77
import site.siredvin.turtlematic.common.configuration.TurtlematicConfig
88
import site.siredvin.turtlematic.computercraft.operations.SphereOperation
99
import site.siredvin.turtlematic.computercraft.plugins.*
10-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
11-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
10+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
11+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
1212
import site.siredvin.tweakium.modules.peripheral.api.InteractionMode
1313

1414
class EndAutomataCorePeripheral(

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/EnormousAutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import site.siredvin.turtlematic.api.PeripheralConfiguration
77
import site.siredvin.turtlematic.common.configuration.TurtlematicConfig
88
import site.siredvin.turtlematic.computercraft.operations.SphereOperation
99
import site.siredvin.turtlematic.computercraft.plugins.*
10-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
11-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
10+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
11+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
1212
import site.siredvin.tweakium.modules.peripheral.api.InteractionMode
1313

1414
class EnormousAutomataCorePeripheral(

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/HusbandryAutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import site.siredvin.turtlematic.computercraft.operations.SphereOperation
2424
import site.siredvin.turtlematic.computercraft.plugins.*
2525
import site.siredvin.turtlematic.tags.BlockTags
2626
import site.siredvin.turtlematic.tags.EntityTags
27-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
28-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
27+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
28+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
2929
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralOperation
3030
import site.siredvin.tweakium.modules.peripheral.api.InteractionMode
3131
import site.siredvin.tweakium.modules.peripheral.api.VerticalDirection

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/ProtectiveAutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import site.siredvin.turtlematic.common.configuration.TurtlematicConfig
1212
import site.siredvin.turtlematic.computercraft.operations.SphereOperation
1313
import site.siredvin.turtlematic.computercraft.plugins.*
1414
import site.siredvin.turtlematic.tags.EntityTags
15-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
16-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
15+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
16+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
1717
import site.siredvin.tweakium.modules.peripheral.api.InteractionMode
1818
import java.util.function.Predicate
1919

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/BrewingAutomataCorePeripheral.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import site.siredvin.turtlematic.computercraft.operations.SingleOperation
3030
import site.siredvin.turtlematic.computercraft.operations.SphereOperation
3131
import site.siredvin.turtlematic.computercraft.plugins.*
3232
import site.siredvin.turtlematic.util.TurtleDispenseBehavior
33-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
34-
import site.siredvin.tweakium.modules.peripheral.ability.ScanningBoon
33+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
34+
import site.siredvin.tweakium.modules.peripheral.boon.ScanningBoon
3535
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralOperation
3636
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralOwner
3737
import site.siredvin.tweakium.modules.peripheral.api.InteractionMode

‎projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/EnchantingAutomataCorePeripheral.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import site.siredvin.turtlematic.api.PeripheralConfiguration
2222
import site.siredvin.turtlematic.common.configuration.TurtlematicConfig
2323
import site.siredvin.turtlematic.computercraft.operations.SingleOperation
2424
import site.siredvin.turtlematic.tags.BlockTags
25-
import site.siredvin.tweakium.modules.peripheral.ability.PeripheralOwnerBoonKey
25+
import site.siredvin.tweakium.modules.peripheral.boon.PeripheralOwnerBoonKey
2626
import site.siredvin.tweakium.modules.peripheral.api.IPeripheralOperation
2727
import site.siredvin.tweakium.modules.peripheral.representation.LuaRepresentation
2828
import site.siredvin.tweakium.modules.peripheral.util.assertBetween

0 commit comments

Comments
 (0)