diff --git a/build.gradle.kts b/build.gradle.kts index 6a07eca..ce7dd15 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ @Suppress("DSL_SCOPE_VIOLATION") plugins { - id("site.siredvin.root") version "0.3.6" + id("site.siredvin.root") version "0.3.8" } subprojectShaking { diff --git a/gradle.properties b/gradle.properties index 1ff20f1..5331fc8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx4G org.gradle.warning.mode = all minecraftVersion = 1.19.4 # Mod Properties -modVersion = 0.6.3-1 +modVersion = 0.6.3-2 mavenGroup = site.siredvin modBaseName = turtlematic archivesBaseName = turtlematic diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/AutomataCoreTier.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/AutomataCoreTier.kt index 7a94f7e..1e05016 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/AutomataCoreTier.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/AutomataCoreTier.kt @@ -7,14 +7,16 @@ enum class AutomataCoreTier( private val defaultInteractionRadius: Int, private val defaultMaxFuelConsumptionRate: Int, private val defaultCooldownReduceFactor: Double, + private val defaultStorageScalingFactor: Double, private val _traits: Set = emptySet(), ) : IAutomataCoreTier { - TIER1(2, 2, 1.0), - TIER2(4, 3, 1.0), + TIER1(2, 2, 1.0, 1.0), + TIER2(4, 3, 1.0, 2.0), TIER3( 8, 4, 0.8, + 4.0, setOf( AutomataCoreTraits.DURABILITY_REFUND_CHANCE, AutomataCoreTraits.APPRENTICE, @@ -24,6 +26,7 @@ enum class AutomataCoreTier( 16, 6, 0.5, + 8.0, setOf( AutomataCoreTraits.DURABILITY_REFUND, AutomataCoreTraits.STARBOUND_REGENERATION, @@ -35,6 +38,7 @@ enum class AutomataCoreTier( Int.MAX_VALUE, Int.MAX_VALUE, 0.0, + 16.0, setOf( AutomataCoreTraits.DURABILITY_REFUND, AutomataCoreTraits.FUEL_CONSUMPTION_DISABLED, @@ -48,6 +52,7 @@ enum class AutomataCoreTier( private var _interactionRadius: ForgeConfigSpec.IntValue? = null private var _maxFuelConsumptionRate: ForgeConfigSpec.IntValue? = null private var _cooldownReduceFactor: ForgeConfigSpec.DoubleValue? = null + private var _storageScalingFactor: ForgeConfigSpec.DoubleValue? = null override val interactionRadius: Int get() = _interactionRadius?.get() ?: defaultInteractionRadius @@ -58,6 +63,9 @@ enum class AutomataCoreTier( override val cooldownReduceFactor: Double get() = _cooldownReduceFactor?.get() ?: defaultCooldownReduceFactor + override val storageScaleFactor: Double + get() = _storageScalingFactor?.get() ?: defaultStorageScalingFactor + override val traits: Set get() = _traits @@ -83,5 +91,11 @@ enum class AutomataCoreTier( 0.0, 1.0, ) + _storageScalingFactor = builder.defineInRange( + settingsName() + "StorageScalingFactory", + defaultStorageScalingFactor, + 0.0, + 1000.0, + ) } } diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/IAutomataCoreTier.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/IAutomataCoreTier.kt index c79a6bb..6586333 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/IAutomataCoreTier.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/api/IAutomataCoreTier.kt @@ -8,6 +8,7 @@ import kotlin.random.Random interface IAutomataCoreTier : IConfigHandler { val interactionRadius: Int val maxFuelConsumptionRate: Int + val storageScaleFactor: Double /** * This is number, that cooldown will be multiply at diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/configuration/TurtlematicConfig.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/configuration/TurtlematicConfig.kt index e3527ed..c4447ff 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/configuration/TurtlematicConfig.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/configuration/TurtlematicConfig.kt @@ -48,8 +48,8 @@ object TurtlematicConfig : IOperationAbilityConfig { get() = ConfigHolder.COMMON_CONFIG.ENABLE_END_AUTOMATA_CORE.get() val enableHusbandryAutomataCore: Boolean get() = ConfigHolder.COMMON_CONFIG.ENABLE_HUSBANDRY_AUTOMATA_CORE.get() - val enableMercantileAutomataCore: Boolean - get() = ConfigHolder.COMMON_CONFIG.ENABLE_MERCANTILE_AUTOMATA_CORE.get() + val enableFluidyAutomataCore: Boolean + get() = ConfigHolder.COMMON_CONFIG.ENABLE_FLUIDY_AUTOMATA_CORE.get() val enableEnormousAutomata: Boolean get() = ConfigHolder.COMMON_CONFIG.ENABLE_ENORMOUS_AUTOMATA.get() @@ -65,6 +65,8 @@ object TurtlematicConfig : IOperationAbilityConfig { val enableMasonAutomataCore: Boolean get() = ConfigHolder.COMMON_CONFIG.ENABLE_MASON_AUTOMATA_CORE.get() + val enableMercantileAutomataCore: Boolean + get() = ConfigHolder.COMMON_CONFIG.ENABLE_MERCANTILE_AUTOMATA_CORE.get() // automata cores configuration val endAutomataCoreWarpPointLimit: Int @@ -82,6 +84,12 @@ object TurtlematicConfig : IOperationAbilityConfig { val creativeHusbandryAutomataGrownPeriod: Int get() = ConfigHolder.COMMON_CONFIG.CREATIVE_HUSBANDRY_AUTOMATA_GROWN_PERIOD.get() + val fluidyAutomataBaseTankCount: Int + get() = ConfigHolder.COMMON_CONFIG.FLUIDY_AUTOMATA_BASE_TANK_COUNT.get() + + val fluidyAutomataBaseTankCapacity: Int + get() = ConfigHolder.COMMON_CONFIG.FLUIDY_AUTOMATA_BASE_TANK_CAPACITY.get() + val durabilityRestoreChance: Double get() = ConfigHolder.COMMON_CONFIG.DURABILITY_RESTORE_CHANCE.get() @@ -119,7 +127,7 @@ object TurtlematicConfig : IOperationAbilityConfig { val ENABLE_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val ENABLE_END_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val ENABLE_HUSBANDRY_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue - val ENABLE_MERCANTILE_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue + val ENABLE_FLUIDY_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val ENABLE_ENORMOUS_AUTOMATA: ForgeConfigSpec.BooleanValue // Forged automata core @@ -127,6 +135,7 @@ object TurtlematicConfig : IOperationAbilityConfig { val ENABLE_SMITHING_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val ENABLE_ENCHANTING_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val ENABLE_MASON_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue + val ENABLE_MERCANTILE_AUTOMATA_CORE: ForgeConfigSpec.BooleanValue val STARBOUND_AUTOMATA_FUEL_GENERATION_CHANCE: ForgeConfigSpec.DoubleValue val STARBOUND_AUTOMATA_FUEL_GENERATION_AMOUNT: ForgeConfigSpec.IntValue @@ -135,6 +144,8 @@ object TurtlematicConfig : IOperationAbilityConfig { val NETHERITE_HUSBANDRY_AUTOMATA_GROWN_PERIOD: ForgeConfigSpec.IntValue val STARBOUND_HUSBANDRY_AUTOMATA_GROWN_PERIOD: ForgeConfigSpec.IntValue val CREATIVE_HUSBANDRY_AUTOMATA_GROWN_PERIOD: ForgeConfigSpec.IntValue + val FLUIDY_AUTOMATA_BASE_TANK_COUNT: ForgeConfigSpec.IntValue + val FLUIDY_AUTOMATA_BASE_TANK_CAPACITY: ForgeConfigSpec.IntValue val DURABILITY_RESTORE_CHANCE: ForgeConfigSpec.DoubleValue val BREWING_XP_REWARD: ForgeConfigSpec.DoubleValue val ENCHANTING_WIPE_CHANGE: ForgeConfigSpec.DoubleValue @@ -172,13 +183,14 @@ object TurtlematicConfig : IOperationAbilityConfig { ENABLE_AUTOMATA_CORE = builder.define("enableWeakAutomataCore", true) ENABLE_END_AUTOMATA_CORE = builder.define("enableEndAutomataCore", true) ENABLE_HUSBANDRY_AUTOMATA_CORE = builder.define("enableHusbandryAutomataCore", true) - ENABLE_MERCANTILE_AUTOMATA_CORE = builder.define("enableMercantileAutomataCore", true) + ENABLE_FLUIDY_AUTOMATA_CORE = builder.define("enableFluidyAutomataCore", true) ENABLE_ENORMOUS_AUTOMATA = builder.define("enableEnormousAutomata", true) ENABLE_BREWING_AUTOMATA_CORE = builder.define("enableBrewingAutomataCore", true) ENABLE_SMITHING_AUTOMATA_CORE = builder.define("enableSmithingAutomataCore", true) ENABLE_ENCHANTING_AUTOMATA_CORE = builder.define("enableEnchantingAutomataCore", true) ENABLE_MASON_AUTOMATA_CORE = builder.define("enableMasonAutomataCore", true) + ENABLE_MERCANTILE_AUTOMATA_CORE = builder.define("enableMercantileAutomataCore", true) END_AUTOMATA_CORE_WARP_POINT_LIMIT = builder.comment("Defines max warp point stored in warp core. Mostly need to not allow NBT overflow error") .defineInRange("endAutomataCoreWarpPointLimit", 64, 1, Int.MAX_VALUE) @@ -190,6 +202,10 @@ object TurtlematicConfig : IOperationAbilityConfig { .defineInRange("starboundHusbandryAutomataGrownPeriod", 2, 1, Int.MAX_VALUE) CREATIVE_HUSBANDRY_AUTOMATA_GROWN_PERIOD = builder.comment("Amount of ticks that separate single random tick for all of surrounding crops for creative husbandry automata") .defineInRange("creativeHusbandryAutomataGrownPeriod", 40, 1, Int.MAX_VALUE) + FLUIDY_AUTOMATA_BASE_TANK_COUNT = builder.comment("Defines base fluidy automata tank count") + .defineInRange("fluidyAutomataBaseTankCount", 1, 1, 16) + FLUIDY_AUTOMATA_BASE_TANK_CAPACITY = builder.comment("Defines base fluidy automata tank capacity in forge buckets") + .defineInRange("fluidyAutomataBaseTankCapacity", 4, 1, Int.MAX_VALUE) DURABILITY_RESTORE_CHANCE = builder.comment("Defined chance to not loose item durability for netherite cores") .defineInRange("durabilityRestoreChance", 0.1, 0.0, 1.0) STARBOUND_AUTOMATA_FUEL_GENERATION_CHANCE = builder.comment("Defines chance for starbound automata to regenerate fuel points") diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/recipe/SoulHarvestRecipeRegistry.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/recipe/SoulHarvestRecipeRegistry.kt index f180e95..d4dc637 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/recipe/SoulHarvestRecipeRegistry.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/recipe/SoulHarvestRecipeRegistry.kt @@ -64,16 +64,13 @@ object SoulHarvestRecipeRegistry { ), Items.HUSBANDRY_AUTOMATA_CORE.get(), ) - val mercantileSoulRecord = - SoulHarvestRecipe( - listOf( - SimpleSoulHarvestIngredient(EntityType.WANDERING_TRADER, 1), - ), - Items.MERCANTILE_AUTOMATA_CORE.get(), - ) + val fluidySoulRecipe = SoulHarvestRecipe( + listOf(SimpleSoulHarvestIngredient(EntityType.SQUID, 4)), + Items.FLUIDY_AUTOMATA_CORE.get(), + ) addRecipe(Items.AUTOMATA_CORE.get(), endSoulRecord) addRecipe(Items.AUTOMATA_CORE.get(), husbandrySoulRecord) - addRecipe(Items.FORGED_AUTOMATA_CORE.get(), mercantileSoulRecord) + addRecipe(Items.AUTOMATA_CORE.get(), fluidySoulRecipe) } fun injectForgedAutomataCoreRecipes() { @@ -89,9 +86,17 @@ object SoulHarvestRecipeRegistry { listOf(VillagerSoulHarvestIngredient(VillagerProfession.TOOLSMITH)), Items.SMITHING_AUTOMATA_CORE.get(), ) + val mercantileSoulRecord = + SoulHarvestRecipe( + listOf( + SimpleSoulHarvestIngredient(EntityType.WANDERING_TRADER, 1), + ), + Items.MERCANTILE_AUTOMATA_CORE.get(), + ) addRecipe(Items.FORGED_AUTOMATA_CORE.get(), brewingAutomataRecord) addRecipe(Items.FORGED_AUTOMATA_CORE.get(), enchantingAutomataRecord) addRecipe(Items.FORGED_AUTOMATA_CORE.get(), smithingAutomataRecord) + addRecipe(Items.FORGED_AUTOMATA_CORE.get(), mercantileSoulRecord) } } diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/setup/Items.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/setup/Items.kt index c5407cb..bbfa9ca 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/setup/Items.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/setup/Items.kt @@ -25,24 +25,36 @@ object Items { val END_AUTOMATA_CORE = TurtlematicPlatform.registerItem("end_automata_core") { RecipeAutomataCore(AutomataCoreTier.TIER2, TurtlematicConfig::enableEndAutomataCore) } + val FLUIDY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("fluidy_automata_core") { + RecipeAutomataCore(AutomataCoreTier.TIER2, TurtlematicConfig::enableFluidyAutomataCore) + } val NETHERITE_HUSBANDRY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("netherite_husbandry_automata_core") { BaseAutomataCore(AutomataCoreTier.TIER3, TurtlematicConfig::enableHusbandryAutomataCore, itemUsageTooltip, husbandryTooltip) } val NETHERITE_END_AUTOMATA_CORE = TurtlematicPlatform.registerItem("netherite_end_automata_core") { BaseAutomataCore(AutomataCoreTier.TIER3, TurtlematicConfig::enableEndAutomataCore, itemUsageTooltip) } + val NETHERITE_FLUIDY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("netherite_fluidy_automata_core") { + BaseAutomataCore(AutomataCoreTier.TIER3, TurtlematicConfig::enableFluidyAutomataCore, itemUsageTooltip) + } val STARBOUND_HUSBANDRY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("starbound_husbandry_automata_core") { BaseAutomataCore(AutomataCoreTier.TIER4, TurtlematicConfig::enableHusbandryAutomataCore, itemUsageTooltip, husbandryTooltip) } val STARBOUND_END_AUTOMATA_CORE = TurtlematicPlatform.registerItem("starbound_end_automata_core") { BaseAutomataCore(AutomataCoreTier.TIER4, TurtlematicConfig::enableEndAutomataCore, itemUsageTooltip) } + val STARBOUND_FLUIDY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("starbound_fluidy_automata_core") { + BaseAutomataCore(AutomataCoreTier.TIER4, TurtlematicConfig::enableFluidyAutomataCore, itemUsageTooltip) + } val CREATIVE_HUSBANDRY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("creative_husbandry_automata_core") { BaseAutomataCore(AutomataCoreTier.CREATIVE, TurtlematicConfig::enableHusbandryAutomataCore, itemUsageTooltip, husbandryTooltip) } val CREATIVE_END_AUTOMATA_CORE = TurtlematicPlatform.registerItem("creative_end_automata_core") { BaseAutomataCore(AutomataCoreTier.CREATIVE, TurtlematicConfig::enableEndAutomataCore, itemUsageTooltip) } + val CREATIVE_FLUIDY_AUTOMATA_CORE = TurtlematicPlatform.registerItem("creative_fluidy_automata_core") { + BaseAutomataCore(AutomataCoreTier.CREATIVE, TurtlematicConfig::enableFluidyAutomataCore, itemUsageTooltip) + } val ENORMOUS_AUTOMATA_CORE = TurtlematicPlatform.registerItem("enormous_automata_core") { BaseAutomataCore(AutomataCoreTier.CREATIVE, TurtlematicConfig::enableEnormousAutomata, itemUsageTooltip) } diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/FluidyAutomataCorePeripheral.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/FluidyAutomataCorePeripheral.kt new file mode 100644 index 0000000..0e4d9b3 --- /dev/null +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/FluidyAutomataCorePeripheral.kt @@ -0,0 +1,43 @@ +package site.siredvin.turtlematic.computercraft.peripheral.automatas + +import dan200.computercraft.api.turtle.ITurtleAccess +import dan200.computercraft.api.turtle.TurtleSide +import site.siredvin.peripheralium.computercraft.peripheral.ability.PeripheralOwnerAbility +import site.siredvin.peripheralium.computercraft.peripheral.ability.ScanningAbility +import site.siredvin.turtlematic.api.IAutomataCoreTier +import site.siredvin.turtlematic.api.PeripheralConfiguration +import site.siredvin.turtlematic.common.configuration.TurtlematicConfig +import site.siredvin.turtlematic.computercraft.operations.SphereOperation +import site.siredvin.turtlematic.computercraft.plugins.* + +class FluidyAutomataCorePeripheral( + turtle: ITurtleAccess, + side: TurtleSide, + tier: IAutomataCoreTier, +) : BaseAutomataCorePeripheral( + TYPE, + turtle, + side, + tier, +) { + init { + addPlugin(AutomataLookPlugin(this)) + addPlugin(AutomataInteractionPlugin(this)) + peripheralOwner.attachAbility( + PeripheralOwnerAbility.SCANNING, + ScanningAbility( + peripheralOwner, + tier.interactionRadius, + ).attachItemScan(SphereOperation.SCAN_ITEMS).attachBlockScan( + SphereOperation.SCAN_BLOCKS, + ), + ) + } + + companion object : PeripheralConfiguration { + override val TYPE = "fluidyAutomata" + } + + override val isEnabled: Boolean + get() = TurtlematicConfig.enableFluidyAutomataCore +} diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/HusbandryAutomataCorePeripheral.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/HusbandryAutomataCorePeripheral.kt index e710aa1..8f56b16 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/HusbandryAutomataCorePeripheral.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/automatas/HusbandryAutomataCorePeripheral.kt @@ -24,7 +24,6 @@ import site.siredvin.peripheralium.util.representation.animalData import site.siredvin.peripheralium.util.representation.beeNestAnalyze import site.siredvin.peripheralium.util.representation.cropAge import site.siredvin.peripheralium.util.representation.honeyLevel -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.api.AutomataCoreTraits import site.siredvin.turtlematic.api.IAutomataCoreTier import site.siredvin.turtlematic.api.PeripheralConfiguration diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/MasonAutomataCorePeripheral.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/MasonAutomataCorePeripheral.kt index b38f38c..d700b5c 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/MasonAutomataCorePeripheral.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/MasonAutomataCorePeripheral.kt @@ -32,7 +32,6 @@ import site.siredvin.peripheralium.util.LimitedInventory import site.siredvin.peripheralium.util.Pair import site.siredvin.peripheralium.util.representation.LuaInterpretation import site.siredvin.peripheralium.util.representation.stateProperties -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.peripheralium.xplat.PeripheraliumPlatform import site.siredvin.peripheralium.xplat.XplatRegistries import site.siredvin.turtlematic.api.IAutomataCoreTier diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/SmithingAutomataCorePeripheral.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/SmithingAutomataCorePeripheral.kt index c86d1a3..9302a90 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/SmithingAutomataCorePeripheral.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/forged/SmithingAutomataCorePeripheral.kt @@ -24,7 +24,6 @@ import site.siredvin.peripheralium.api.peripheral.IPeripheralOperation import site.siredvin.peripheralium.api.storage.ContainerUtils import site.siredvin.peripheralium.computercraft.peripheral.ability.PeripheralOwnerAbility import site.siredvin.peripheralium.util.* -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.peripheralium.xplat.PeripheraliumPlatform import site.siredvin.turtlematic.api.IAutomataCoreTier import site.siredvin.turtlematic.api.PeripheralConfiguration diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/misc/SoulScrapperPeripheral.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/misc/SoulScrapperPeripheral.kt index 97e5537..3f82423 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/misc/SoulScrapperPeripheral.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/peripheral/misc/SoulScrapperPeripheral.kt @@ -11,7 +11,6 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.phys.EntityHitResult import site.siredvin.peripheralium.computercraft.peripheral.OwnedPeripheral import site.siredvin.peripheralium.computercraft.peripheral.owner.TurtlePeripheralOwner -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.api.ISoulFeedableItem import site.siredvin.turtlematic.api.PeripheralConfiguration diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataAIPlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataAIPlugin.kt index c17e156..d896da7 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataAIPlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataAIPlugin.kt @@ -9,7 +9,6 @@ import net.minecraft.world.entity.Mob import net.minecraft.world.phys.EntityHitResult import net.minecraft.world.phys.HitResult import site.siredvin.peripheralium.api.datatypes.VerticalDirection -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.computercraft.peripheral.automatas.BaseAutomataCorePeripheral import java.util.function.Predicate diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataCapturePlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataCapturePlugin.kt index 1560af3..33c6d70 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataCapturePlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataCapturePlugin.kt @@ -20,7 +20,6 @@ import site.siredvin.peripheralium.api.peripheral.IPeripheralCheck import site.siredvin.peripheralium.api.peripheral.IPeripheralFunction import site.siredvin.peripheralium.api.peripheral.IPeripheralOperation import site.siredvin.peripheralium.util.representation.LuaRepresentation -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.peripheralium.xplat.PeripheraliumPlatform import site.siredvin.peripheralium.xplat.XplatRegistries import site.siredvin.turtlematic.computercraft.operations.SingleOperation diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataFluidStoragePlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataFluidStoragePlugin.kt new file mode 100644 index 0000000..a82504d --- /dev/null +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataFluidStoragePlugin.kt @@ -0,0 +1,23 @@ +package site.siredvin.turtlematic.computercraft.plugins + +import dan200.computercraft.api.lua.LuaFunction +import dan200.computercraft.api.lua.MethodResult +import site.siredvin.turtlematic.computercraft.peripheral.automatas.BaseAutomataCorePeripheral + +class AutomataFluidStoragePlugin(private val tankCount: Int, private val tankCapacity: Int, automataCore: BaseAutomataCorePeripheral) : AutomataCorePlugin(automataCore) { + + @LuaFunction(mainThread = true) + fun storeFluid(): MethodResult { + return MethodResult.of() + } + + @LuaFunction(mainThread = true) + fun placeFluid(destination: String, name: String): MethodResult { + return MethodResult.of() + } + + @LuaFunction(mainThread = true) + fun getStored(): MethodResult { + return MethodResult.of() + } +} diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataInteractionPlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataInteractionPlugin.kt index 89a4bf1..814edd7 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataInteractionPlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataInteractionPlugin.kt @@ -5,13 +5,11 @@ import dan200.computercraft.api.lua.LuaException import dan200.computercraft.api.lua.LuaFunction import dan200.computercraft.api.lua.MethodResult import net.minecraft.world.entity.Entity -import net.minecraft.world.entity.Pose import net.minecraft.world.item.ItemStack import site.siredvin.peripheralium.api.datatypes.InteractionMode import site.siredvin.peripheralium.api.datatypes.VerticalDirection import site.siredvin.peripheralium.api.peripheral.IPeripheralOperation import site.siredvin.peripheralium.computercraft.peripheral.owner.TurtlePeripheralOwner -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.computercraft.operations.SingleOperation import site.siredvin.turtlematic.computercraft.peripheral.automatas.BaseAutomataCorePeripheral import java.util.function.Predicate diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataLookPlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataLookPlugin.kt index 2467fc1..81ab16e 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataLookPlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataLookPlugin.kt @@ -12,7 +12,6 @@ import net.minecraft.world.phys.HitResult import site.siredvin.peripheralium.api.datatypes.InteractionMode import site.siredvin.peripheralium.api.datatypes.VerticalDirection import site.siredvin.peripheralium.util.representation.LuaRepresentation -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.computercraft.peripheral.automatas.BaseAutomataCorePeripheral import java.util.function.BiConsumer diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataRestockPlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataRestockPlugin.kt index c38d882..d314bc5 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataRestockPlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataRestockPlugin.kt @@ -9,7 +9,6 @@ import net.minecraft.world.phys.EntityHitResult import net.minecraft.world.phys.HitResult import site.siredvin.peripheralium.api.datatypes.VerticalDirection import site.siredvin.peripheralium.api.peripheral.IPeripheralOperation -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.computercraft.operations.SingleOperation import site.siredvin.turtlematic.computercraft.peripheral.forged.ExperienceAutomataCorePeripheral import java.util.* diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataTradePlugin.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataTradePlugin.kt index 9208566..39ec1f9 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataTradePlugin.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/computercraft/plugins/AutomataTradePlugin.kt @@ -15,7 +15,6 @@ import net.minecraft.world.phys.HitResult import site.siredvin.peripheralium.api.datatypes.VerticalDirection import site.siredvin.peripheralium.api.peripheral.IPeripheralOperation import site.siredvin.peripheralium.api.storage.ContainerUtils -import site.siredvin.peripheralium.util.world.FakePlayerProxy import site.siredvin.turtlematic.computercraft.operations.SingleOperation import site.siredvin.turtlematic.computercraft.peripheral.forged.ExperienceAutomataCorePeripheral import java.util.* diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModRecipeProvider.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModRecipeProvider.kt index f7dcdea..354382b 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModRecipeProvider.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModRecipeProvider.kt @@ -71,6 +71,11 @@ class ModRecipeProvider(output: PackOutput) : RecipeProvider(output) { ModRecipeIngredients.get().netheriteIngot, Items.NETHERITE_HUSBANDRY_AUTOMATA_CORE.get(), ).save(consumer) + TweakedUpgradeRecipeBuilder.smithing( + Ingredient.of(Items.FLUIDY_AUTOMATA_CORE.get()), + ModRecipeIngredients.get().netheriteIngot, + Items.NETHERITE_FLUIDY_AUTOMATA_CORE.get(), + ).save(consumer) TweakedUpgradeRecipeBuilder.smithing( Ingredient.of(Items.END_AUTOMATA_CORE.get()), ModRecipeIngredients.get().netheriteIngot, @@ -86,6 +91,11 @@ class ModRecipeProvider(output: PackOutput) : RecipeProvider(output) { ModRecipeIngredients.get().netherStar, Items.STARBOUND_END_AUTOMATA_CORE.get(), ).save(consumer) + TweakedUpgradeRecipeBuilder.smithing( + Ingredient.of(Items.NETHERITE_FLUIDY_AUTOMATA_CORE.get()), + ModRecipeIngredients.get().netherStar, + Items.STARBOUND_FLUIDY_AUTOMATA_CORE.get(), + ).save(consumer) TweakedUpgradeRecipeBuilder.smithing( Ingredient.of(Items.BREWING_AUTOMATA_CORE.get()), diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/xplat/TurtlematicCommonHooks.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/xplat/TurtlematicCommonHooks.kt index cc17a26..afc645e 100644 --- a/projects/core/src/main/kotlin/site/siredvin/turtlematic/xplat/TurtlematicCommonHooks.kt +++ b/projects/core/src/main/kotlin/site/siredvin/turtlematic/xplat/TurtlematicCommonHooks.kt @@ -25,10 +25,7 @@ import site.siredvin.turtlematic.common.items.base.BaseAutomataCore import site.siredvin.turtlematic.common.recipe.SoulHarvestRecipeRegistry import site.siredvin.turtlematic.common.setup.EntityTypes import site.siredvin.turtlematic.common.setup.Items -import site.siredvin.turtlematic.computercraft.peripheral.automatas.AutomataCorePeripheral -import site.siredvin.turtlematic.computercraft.peripheral.automatas.EndAutomataCorePeripheral -import site.siredvin.turtlematic.computercraft.peripheral.automatas.EnormousAutomataCorePeripheral -import site.siredvin.turtlematic.computercraft.peripheral.automatas.HusbandryAutomataCorePeripheral +import site.siredvin.turtlematic.computercraft.peripheral.automatas.* import site.siredvin.turtlematic.computercraft.peripheral.forged.* import site.siredvin.turtlematic.computercraft.peripheral.misc.* import site.siredvin.turtlematic.computercraft.turtle.ChunkVialTurtle @@ -251,6 +248,10 @@ object TurtlematicCommonHooks { registerClockwiseTurtleUpgrade(HusbandryAutomataCorePeripheral.UPGRADE_ID.toNetherite(), Items.NETHERITE_HUSBANDRY_AUTOMATA_CORE, ::HusbandryAutomataCorePeripheral, TickerFunctions::netheriteHusbandryTick) registerStarboundTurtleUpgrade(HusbandryAutomataCorePeripheral.UPGRADE_ID.toStarbound(), Items.STARBOUND_HUSBANDRY_AUTOMATA_CORE, ::HusbandryAutomataCorePeripheral, TickerFunctions::starboundHusbandryTick) registerClockwiseTurtleUpgrade(HusbandryAutomataCorePeripheral.UPGRADE_ID.toCreative(), Items.CREATIVE_HUSBANDRY_AUTOMATA_CORE, ::HusbandryAutomataCorePeripheral, TickerFunctions::creativeHusbandryTick) + registerClockwiseTurtleUpgrade(FluidyAutomataCorePeripheral.UPGRADE_ID, Items.FLUIDY_AUTOMATA_CORE, ::FluidyAutomataCorePeripheral) + registerClockwiseTurtleUpgrade(FluidyAutomataCorePeripheral.UPGRADE_ID.toNetherite(), Items.NETHERITE_FLUIDY_AUTOMATA_CORE, ::FluidyAutomataCorePeripheral) + registerStarboundTurtleUpgrade(FluidyAutomataCorePeripheral.UPGRADE_ID.toStarbound(), Items.STARBOUND_FLUIDY_AUTOMATA_CORE, ::FluidyAutomataCorePeripheral) + registerClockwiseTurtleUpgrade(FluidyAutomataCorePeripheral.UPGRADE_ID.toCreative(), Items.CREATIVE_FLUIDY_AUTOMATA_CORE, ::FluidyAutomataCorePeripheral) registerClockwiseTurtleUpgrade(EndAutomataCorePeripheral.UPGRADE_ID, Items.END_AUTOMATA_CORE, ::EndAutomataCorePeripheral) registerClockwiseTurtleUpgrade(EndAutomataCorePeripheral.UPGRADE_ID.toNetherite(), Items.NETHERITE_END_AUTOMATA_CORE, ::EndAutomataCorePeripheral) registerStarboundTurtleUpgrade(EndAutomataCorePeripheral.UPGRADE_ID.toStarbound(), Items.STARBOUND_END_AUTOMATA_CORE, ::EndAutomataCorePeripheral) diff --git a/projects/core/src/main/resources/assets/turtlematic/models/item/creative_fluidy_automata_core.json b/projects/core/src/main/resources/assets/turtlematic/models/item/creative_fluidy_automata_core.json new file mode 100644 index 0000000..7edf024 --- /dev/null +++ b/projects/core/src/main/resources/assets/turtlematic/models/item/creative_fluidy_automata_core.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "turtlematic:item/creative_gear", + "layer1": "turtlematic:item/big_fire/blue" + } +} \ No newline at end of file diff --git a/projects/core/src/main/resources/assets/turtlematic/models/item/fluidy_automata_core.json b/projects/core/src/main/resources/assets/turtlematic/models/item/fluidy_automata_core.json new file mode 100644 index 0000000..fcb4d2d --- /dev/null +++ b/projects/core/src/main/resources/assets/turtlematic/models/item/fluidy_automata_core.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "turtlematic:item/base_gear", + "layer1": "turtlematic:item/fire/blue" + } +} \ No newline at end of file diff --git a/projects/core/src/main/resources/assets/turtlematic/models/item/netherite_fluidy_automata_core.json b/projects/core/src/main/resources/assets/turtlematic/models/item/netherite_fluidy_automata_core.json new file mode 100644 index 0000000..74a4725 --- /dev/null +++ b/projects/core/src/main/resources/assets/turtlematic/models/item/netherite_fluidy_automata_core.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "turtlematic:item/netherite_gear", + "layer1": "turtlematic:item/fire/blue" + } +} \ No newline at end of file diff --git a/projects/core/src/main/resources/assets/turtlematic/models/item/starbound_fluidy_automata_core.json b/projects/core/src/main/resources/assets/turtlematic/models/item/starbound_fluidy_automata_core.json new file mode 100644 index 0000000..1df818e --- /dev/null +++ b/projects/core/src/main/resources/assets/turtlematic/models/item/starbound_fluidy_automata_core.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "turtlematic:item/starbound_gear", + "layer1": "turtlematic:item/big_fire/blue" + } +} \ No newline at end of file diff --git a/projects/core/src/main/resources/assets/turtlematic/textures/item/big_fire/blue.png b/projects/core/src/main/resources/assets/turtlematic/textures/item/big_fire/blue.png new file mode 100644 index 0000000..5b1617a Binary files /dev/null and b/projects/core/src/main/resources/assets/turtlematic/textures/item/big_fire/blue.png differ diff --git a/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec b/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec index ca3e1c5..3860979 100644 --- a/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec +++ b/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec @@ -1,2 +1,2 @@ -// 1.19.4 2023-05-21T21:23:50.682534 Turtlematic/Tags for minecraft:entity_type +// 1.19.4 2023-06-02T22:53:08.008559836 Turtlematic/Tags for minecraft:entity_type 916474b74424282b20dc9400f53d3baa4e34951c data/turtlematic/tags/entity_types/animal.json diff --git a/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6 b/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6 index d388cc4..dc64efc 100644 --- a/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6 +++ b/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6 @@ -1,3 +1,3 @@ -// 1.19.4 2023-05-21T21:23:50.673961 Turtlematic/Tags for minecraft:block -4d1abb425b105905a7b45e3187fdfc56fc37c4b2 data/turtlematic/tags/blocks/husbandry_extra_crops.json +// 1.19.4 2023-06-02T22:53:08.008454903 Turtlematic/Tags for minecraft:block aa196e5473daadd5b73af0ab19705a24b53a7464 data/turtlematic/tags/blocks/enchantment_power_provider.json +4d1abb425b105905a7b45e3187fdfc56fc37c4b2 data/turtlematic/tags/blocks/husbandry_extra_crops.json diff --git a/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10 b/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10 index 9482053..ed91644 100644 --- a/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10 +++ b/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10 @@ -1,2 +1,2 @@ -// 1.19.4 2023-05-21T21:23:50.670631 Turtlematic/Tags for minecraft:item +// 1.19.4 2023-06-02T22:53:08.007238514 Turtlematic/Tags for minecraft:item f81daf5710edcc0407f666c5aff78ac08af75657 data/turtlematic/tags/items/enchantment_power_provider.json diff --git a/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46 b/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46 index 52b6630..c7f2947 100644 --- a/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46 +++ b/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46 @@ -1,34 +1,38 @@ -// 1.19.4 2023-05-21T21:23:50.672062 Turtlematic/Turtle Upgrades -bd600ade9cfaf431bb8e5abc4d5e4dc36d958f6a data/turtlematic/computercraft/turtle_upgrades/starbound_enchanting_automata.json -df46d3a0964bf4ea6b1e8427ce8094a40eccb2cf data/turtlematic/computercraft/turtle_upgrades/starbound_smithing_automata.json -bc9c7fa12c0fc63d718ac7abbcdae3e73d08d773 data/turtlematic/computercraft/turtle_upgrades/lava_bucket.json +// 1.19.4 2023-06-02T22:53:08.007859433 Turtlematic/Turtle Upgrades +9b2ddb951d234857533a8b1bf8ccbe53eb73ef24 data/turtlematic/computercraft/turtle_upgrades/creative_mason_automata.json +8fff04acaa49950df15fecf1772c2feb9ed4252b data/turtlematic/computercraft/turtle_upgrades/netherite_husbandry_automata.json 936aa5440c21f60d66958202451d3826d60e6acd data/turtlematic/computercraft/turtle_upgrades/chatter.json +1f06fa6380de95a933333f32901920f5f8ff28c1 data/turtlematic/computercraft/turtle_upgrades/starbound_husbandry_automata.json +b0bc6029f3e73bd7253e435c37917d421d8c20c1 data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json +145f673041d392a42706969711a1b92e2fa4fe43 data/turtlematic/computercraft/turtle_upgrades/starbound_mason_automata.json +f49e5a61de4008bf83ac6c26153c589b4a8d8d4c data/turtlematic/computercraft/turtle_upgrades/creative_enchanting_automata.json +dc6c3ae644b1aa45dc75db2f09d32bd3ce770dcc data/turtlematic/computercraft/turtle_upgrades/creative_husbandry_automata.json +feb4976e78eecd2d2c49ed93a3b623a0eeedf49f data/turtlematic/computercraft/turtle_upgrades/husbandry_automata.json +0d90bb420ce9ca773a891e834831e90469577ef7 data/turtlematic/computercraft/turtle_upgrades/creative_smithing_automata.json +4844cfbb85ea8d959323e9daf65fda5ee3f4ad2a data/turtlematic/computercraft/turtle_upgrades/smithing_automata.json f7e7c316c39a0014771f4865f57b833297113f92 data/turtlematic/computercraft/turtle_upgrades/mercantile_automata.json -9d11ceec2265d51b56c609e0302cf058c7beaf6d data/turtlematic/computercraft/turtle_upgrades/creative_mercantile_automata.json -8c306d0321371f6024f865842e468371bac8f6c5 data/turtlematic/computercraft/turtle_upgrades/mason_automata.json +820ea2991e2e4070c288666e4e2109c50b5e7292 data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json +085926cbc757aaa4de21e355334e1aae38104cd2 data/turtlematic/computercraft/turtle_upgrades/sticky_piston.json +2f0014863324973bb1090f284d72ffaacd71f167 data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json 114ea7da3c70f7e66c77e3af05faf01f0993ad42 data/turtlematic/computercraft/turtle_upgrades/netherite_end_automata.json -49ee5d4b887d591d9bf629ffd300383f9319699f data/turtlematic/computercraft/turtle_upgrades/creative_end_automata.json -4844cfbb85ea8d959323e9daf65fda5ee3f4ad2a data/turtlematic/computercraft/turtle_upgrades/smithing_automata.json -8228427add008f6e044145c914a8230e136c0766 data/turtlematic/computercraft/turtle_upgrades/enormous_automata.json -058289530e97d7e56c3c9226b0da328c5afceb86 data/turtlematic/computercraft/turtle_upgrades/starbound_brewing_automata.json -df1614aaf6e6827f94eda0ea7e042481f3f2dec9 data/turtlematic/computercraft/turtle_upgrades/creative_brewing_automata.json -2c86e927fa2cfedac75ea0c89c514f5d67582404 data/turtlematic/computercraft/turtle_upgrades/piston.json -8fff04acaa49950df15fecf1772c2feb9ed4252b data/turtlematic/computercraft/turtle_upgrades/netherite_husbandry_automata.json +8c306d0321371f6024f865842e468371bac8f6c5 data/turtlematic/computercraft/turtle_upgrades/mason_automata.json +dbfd51a22689455c68c7bef25ce0aa14e8eab4ef data/turtlematic/computercraft/turtle_upgrades/bow.json +70387cb75032486cfa83f481d58e42f9da98ddc7 data/turtlematic/computercraft/turtle_upgrades/starbound_mercantile_automata.json +bd600ade9cfaf431bb8e5abc4d5e4dc36d958f6a data/turtlematic/computercraft/turtle_upgrades/starbound_enchanting_automata.json +724e2a6dae889e7792794bee76712ed0a69d2f2d data/turtlematic/computercraft/turtle_upgrades/automata.json 19a74ca3ef9b250ed8198c20cb668018b25f91b5 data/turtlematic/computercraft/turtle_upgrades/enchanting_automata.json -29648c6aaa1fd9fdb6d5cab04ced7dbc7792131d data/turtlematic/computercraft/turtle_upgrades/chunk_vial.json +8228427add008f6e044145c914a8230e136c0766 data/turtlematic/computercraft/turtle_upgrades/enormous_automata.json f4111ec3229fe72804861b3028a705148c72bc86 data/turtlematic/computercraft/turtle_upgrades/soul_scrapper.json -085926cbc757aaa4de21e355334e1aae38104cd2 data/turtlematic/computercraft/turtle_upgrades/sticky_piston.json +1a83de9275d946b7c9917963faacde8e66cfa273 data/turtlematic/computercraft/turtle_upgrades/starbound_end_automata.json +29648c6aaa1fd9fdb6d5cab04ced7dbc7792131d data/turtlematic/computercraft/turtle_upgrades/chunk_vial.json +df1614aaf6e6827f94eda0ea7e042481f3f2dec9 data/turtlematic/computercraft/turtle_upgrades/creative_brewing_automata.json +bc9c7fa12c0fc63d718ac7abbcdae3e73d08d773 data/turtlematic/computercraft/turtle_upgrades/lava_bucket.json +058289530e97d7e56c3c9226b0da328c5afceb86 data/turtlematic/computercraft/turtle_upgrades/starbound_brewing_automata.json +49ee5d4b887d591d9bf629ffd300383f9319699f data/turtlematic/computercraft/turtle_upgrades/creative_end_automata.json +9d11ceec2265d51b56c609e0302cf058c7beaf6d data/turtlematic/computercraft/turtle_upgrades/creative_mercantile_automata.json f4312a8d9ebb61850cec884ac5f39753c00646ca data/turtlematic/computercraft/turtle_upgrades/end_automata.json -dbfd51a22689455c68c7bef25ce0aa14e8eab4ef data/turtlematic/computercraft/turtle_upgrades/bow.json -0d90bb420ce9ca773a891e834831e90469577ef7 data/turtlematic/computercraft/turtle_upgrades/creative_smithing_automata.json -534df964795b71867889133ed24e26a264a7be8f data/turtlematic/computercraft/turtle_upgrades/creative_chest.json -feb4976e78eecd2d2c49ed93a3b623a0eeedf49f data/turtlematic/computercraft/turtle_upgrades/husbandry_automata.json -1f06fa6380de95a933333f32901920f5f8ff28c1 data/turtlematic/computercraft/turtle_upgrades/starbound_husbandry_automata.json -f49e5a61de4008bf83ac6c26153c589b4a8d8d4c data/turtlematic/computercraft/turtle_upgrades/creative_enchanting_automata.json -dc6c3ae644b1aa45dc75db2f09d32bd3ce770dcc data/turtlematic/computercraft/turtle_upgrades/creative_husbandry_automata.json -145f673041d392a42706969711a1b92e2fa4fe43 data/turtlematic/computercraft/turtle_upgrades/starbound_mason_automata.json +df46d3a0964bf4ea6b1e8427ce8094a40eccb2cf data/turtlematic/computercraft/turtle_upgrades/starbound_smithing_automata.json +2e52282bb8781863c42b35f6e10dee0a4cedbe46 data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json a8d14ae53e0ee5332631a787aad4a95c6ed8f96f data/turtlematic/computercraft/turtle_upgrades/brewing_automata.json -70387cb75032486cfa83f481d58e42f9da98ddc7 data/turtlematic/computercraft/turtle_upgrades/starbound_mercantile_automata.json -1a83de9275d946b7c9917963faacde8e66cfa273 data/turtlematic/computercraft/turtle_upgrades/starbound_end_automata.json -9b2ddb951d234857533a8b1bf8ccbe53eb73ef24 data/turtlematic/computercraft/turtle_upgrades/creative_mason_automata.json -724e2a6dae889e7792794bee76712ed0a69d2f2d data/turtlematic/computercraft/turtle_upgrades/automata.json +2c86e927fa2cfedac75ea0c89c514f5d67582404 data/turtlematic/computercraft/turtle_upgrades/piston.json +534df964795b71867889133ed24e26a264a7be8f data/turtlematic/computercraft/turtle_upgrades/creative_chest.json diff --git a/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b b/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b index 3045909..a76f8b5 100644 --- a/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b +++ b/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b @@ -1,15 +1,17 @@ -// 1.19.4 2023-05-21T21:23:50.68349 Turtlematic/Recipes -d3e3eee4aafb753c230a9536daae18d9c020fb4f data/turtlematic/recipes/netherite_end_automata_core.json -925379d63d43f98decb595b7fc7e2b4fc4cf2a33 data/turtlematic/recipes/starbound_mason_automata_core.json -89949d5b370124dd91f60d41a8d10d636e8dbb9f data/turtlematic/recipes/starbound_smithing_automata_core.json +// 1.19.4 2023-06-02T22:53:08.00864849 Turtlematic/Recipes +4ade375fd1258c7cf82ee14baf61947c0bf1cd7a data/turtlematic/recipes/starbound_enchanting_automata_core.json f15156213de4b4b657dc02d84c24fd44162eac77 data/turtlematic/recipes/automata_core.json +e8d13c0955fbfb2733e5b75ebe3448658980dc06 data/turtlematic/recipes/starbound_husbandry_automata_core.json 38193a1bf0a8527c37e8c746016c39d12a27acb4 data/turtlematic/recipes/chunk_vial.json -feb514c55069cbdb96fbf26c65138e1666a945cd data/turtlematic/recipes/forged_automata_core.json -4ade375fd1258c7cf82ee14baf61947c0bf1cd7a data/turtlematic/recipes/starbound_enchanting_automata_core.json 713af1137d33121d7b07959ff4a0b9b08a7ddfa5 data/turtlematic/recipes/starbound_brewing_automata_core.json -57605655591269fed7ec3a6beafdfae76318a3a5 data/turtlematic/recipes/soul_vial.json +07b4db7d287ebaeca09257dd9292a317a9a1f494 data/turtlematic/recipes/netherite_fluidy_automata_core.json d8f62d743eda6918576fc1271177fb3e7fab8af0 data/turtlematic/recipes/netherite_husbandry_automata_core.json -e8d13c0955fbfb2733e5b75ebe3448658980dc06 data/turtlematic/recipes/starbound_husbandry_automata_core.json +feb514c55069cbdb96fbf26c65138e1666a945cd data/turtlematic/recipes/forged_automata_core.json +5eef7f16df46082c0151bae1a96d84900776ebb8 data/turtlematic/recipes/turtle_chatter.json +57605655591269fed7ec3a6beafdfae76318a3a5 data/turtlematic/recipes/soul_vial.json +925379d63d43f98decb595b7fc7e2b4fc4cf2a33 data/turtlematic/recipes/starbound_mason_automata_core.json +525011d40202b6f4a6c09ae892357af2e7c9c52a data/turtlematic/recipes/starbound_fluidy_automata_core.json 7ba1b1637ba65253c3b49bcc0568a669b2749303 data/turtlematic/recipes/soul_scrapper.json a32929a41a4e93e904c6fdea4788080a8e58f11f data/turtlematic/recipes/starbound_end_automata_core.json -5eef7f16df46082c0151bae1a96d84900776ebb8 data/turtlematic/recipes/turtle_chatter.json +d3e3eee4aafb753c230a9536daae18d9c020fb4f data/turtlematic/recipes/netherite_end_automata_core.json +89949d5b370124dd91f60d41a8d10d636e8dbb9f data/turtlematic/recipes/starbound_smithing_automata_core.json diff --git a/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json new file mode 100644 index 0000000..19437e3 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:creative_fluidy_automata", + "item": "turtlematic:creative_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json new file mode 100644 index 0000000..b9cb5c0 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:fluidy_automata", + "item": "turtlematic:fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json new file mode 100644 index 0000000..58db4c7 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:netherite_fluidy_automata", + "item": "turtlematic:netherite_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json new file mode 100644 index 0000000..4b51ca5 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:starbound_fluidy_automata", + "item": "turtlematic:starbound_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/fabric/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json b/projects/fabric/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json new file mode 100644 index 0000000..a0b1621 --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing", + "addition": { + "tag": "c:netherite_ingots" + }, + "base": { + "item": "turtlematic:fluidy_automata_core" + }, + "result": { + "item": "turtlematic:netherite_fluidy_automata_core" + } +} \ No newline at end of file diff --git a/projects/fabric/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json b/projects/fabric/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json new file mode 100644 index 0000000..4702ace --- /dev/null +++ b/projects/fabric/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing", + "addition": { + "item": "minecraft:nether_star" + }, + "base": { + "item": "turtlematic:netherite_fluidy_automata_core" + }, + "result": { + "item": "turtlematic:starbound_fluidy_automata_core" + } +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 b/projects/forge/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 index 216c052..d052ef4 100644 --- a/projects/forge/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 +++ b/projects/forge/src/generated/resources/.cache/2684ce933959e21b1877dd70df4e2422904619b1 @@ -1,14 +1,16 @@ -// 1.19.4 2023-05-21T15:20:30.068654 vanilla/Recipes +// 1.19.4 2023-06-02T22:53:16.254616457 vanilla/Recipes c2ec7cde98ede9a366366f74b89edee511e7ea3f data/turtlematic/recipes/automata_core.json 77a250c6acc8b60874a634f13afdaed7c1317edc data/turtlematic/recipes/chunk_vial.json 8662a873a0d290b80681c71e23124351e3c82cc7 data/turtlematic/recipes/forged_automata_core.json 405b7272c37788ef90537420c2ae42f1b9303e75 data/turtlematic/recipes/netherite_end_automata_core.json +a49f44b66412896900a1bec2009b58d7b48bc4de data/turtlematic/recipes/netherite_fluidy_automata_core.json f1b7f40f8f2694ab84737dd8a9e04dc7a9bfec98 data/turtlematic/recipes/netherite_husbandry_automata_core.json 7ba1b1637ba65253c3b49bcc0568a669b2749303 data/turtlematic/recipes/soul_scrapper.json baa723aacb7fe0f1603beacdd8184310b07fcd21 data/turtlematic/recipes/soul_vial.json 870b531d162bcad4e20fd865ff27aea8c8c9894e data/turtlematic/recipes/starbound_brewing_automata_core.json 6510351211c582428eba6eb0294e7bfdfc156481 data/turtlematic/recipes/starbound_enchanting_automata_core.json 01d54fd92e6a8148f580bb0a6b308667ec1851c1 data/turtlematic/recipes/starbound_end_automata_core.json +913b4d0ecf2ee4c459fb50c43252e6809e20afe0 data/turtlematic/recipes/starbound_fluidy_automata_core.json cc37f1a49e8599779f2ad52d17ef30f3e930d713 data/turtlematic/recipes/starbound_husbandry_automata_core.json 1100415e09efd7c344bd2be958612f1bfc32df83 data/turtlematic/recipes/starbound_mason_automata_core.json f62605120a5d8c7267442692d68ad5b1b7e53348 data/turtlematic/recipes/starbound_smithing_automata_core.json diff --git a/projects/forge/src/generated/resources/.cache/42bea422736702abc417b05c462ae52120b042de b/projects/forge/src/generated/resources/.cache/42bea422736702abc417b05c462ae52120b042de index 4bef5d2..4427e0d 100644 --- a/projects/forge/src/generated/resources/.cache/42bea422736702abc417b05c462ae52120b042de +++ b/projects/forge/src/generated/resources/.cache/42bea422736702abc417b05c462ae52120b042de @@ -1,4 +1,4 @@ -// 1.19.4 2023-05-21T21:24:01.525033 vanilla/Turtle Upgrades +// 1.19.4 2023-06-02T22:53:16.252847097 vanilla/Turtle Upgrades 724e2a6dae889e7792794bee76712ed0a69d2f2d data/turtlematic/computercraft/turtle_upgrades/automata.json dbfd51a22689455c68c7bef25ce0aa14e8eab4ef data/turtlematic/computercraft/turtle_upgrades/bow.json a8d14ae53e0ee5332631a787aad4a95c6ed8f96f data/turtlematic/computercraft/turtle_upgrades/brewing_automata.json @@ -8,6 +8,7 @@ df1614aaf6e6827f94eda0ea7e042481f3f2dec9 data/turtlematic/computercraft/turtle_u 534df964795b71867889133ed24e26a264a7be8f data/turtlematic/computercraft/turtle_upgrades/creative_chest.json f49e5a61de4008bf83ac6c26153c589b4a8d8d4c data/turtlematic/computercraft/turtle_upgrades/creative_enchanting_automata.json 49ee5d4b887d591d9bf629ffd300383f9319699f data/turtlematic/computercraft/turtle_upgrades/creative_end_automata.json +820ea2991e2e4070c288666e4e2109c50b5e7292 data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json dc6c3ae644b1aa45dc75db2f09d32bd3ce770dcc data/turtlematic/computercraft/turtle_upgrades/creative_husbandry_automata.json 9b2ddb951d234857533a8b1bf8ccbe53eb73ef24 data/turtlematic/computercraft/turtle_upgrades/creative_mason_automata.json 9d11ceec2265d51b56c609e0302cf058c7beaf6d data/turtlematic/computercraft/turtle_upgrades/creative_mercantile_automata.json @@ -15,11 +16,13 @@ dc6c3ae644b1aa45dc75db2f09d32bd3ce770dcc data/turtlematic/computercraft/turtle_u 19a74ca3ef9b250ed8198c20cb668018b25f91b5 data/turtlematic/computercraft/turtle_upgrades/enchanting_automata.json f4312a8d9ebb61850cec884ac5f39753c00646ca data/turtlematic/computercraft/turtle_upgrades/end_automata.json 8228427add008f6e044145c914a8230e136c0766 data/turtlematic/computercraft/turtle_upgrades/enormous_automata.json +b0bc6029f3e73bd7253e435c37917d421d8c20c1 data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json feb4976e78eecd2d2c49ed93a3b623a0eeedf49f data/turtlematic/computercraft/turtle_upgrades/husbandry_automata.json bc9c7fa12c0fc63d718ac7abbcdae3e73d08d773 data/turtlematic/computercraft/turtle_upgrades/lava_bucket.json 8c306d0321371f6024f865842e468371bac8f6c5 data/turtlematic/computercraft/turtle_upgrades/mason_automata.json f7e7c316c39a0014771f4865f57b833297113f92 data/turtlematic/computercraft/turtle_upgrades/mercantile_automata.json 114ea7da3c70f7e66c77e3af05faf01f0993ad42 data/turtlematic/computercraft/turtle_upgrades/netherite_end_automata.json +2f0014863324973bb1090f284d72ffaacd71f167 data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json 8fff04acaa49950df15fecf1772c2feb9ed4252b data/turtlematic/computercraft/turtle_upgrades/netherite_husbandry_automata.json 2c86e927fa2cfedac75ea0c89c514f5d67582404 data/turtlematic/computercraft/turtle_upgrades/piston.json 4844cfbb85ea8d959323e9daf65fda5ee3f4ad2a data/turtlematic/computercraft/turtle_upgrades/smithing_automata.json @@ -27,6 +30,7 @@ f4111ec3229fe72804861b3028a705148c72bc86 data/turtlematic/computercraft/turtle_u 058289530e97d7e56c3c9226b0da328c5afceb86 data/turtlematic/computercraft/turtle_upgrades/starbound_brewing_automata.json bd600ade9cfaf431bb8e5abc4d5e4dc36d958f6a data/turtlematic/computercraft/turtle_upgrades/starbound_enchanting_automata.json 1a83de9275d946b7c9917963faacde8e66cfa273 data/turtlematic/computercraft/turtle_upgrades/starbound_end_automata.json +2e52282bb8781863c42b35f6e10dee0a4cedbe46 data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json 1f06fa6380de95a933333f32901920f5f8ff28c1 data/turtlematic/computercraft/turtle_upgrades/starbound_husbandry_automata.json 145f673041d392a42706969711a1b92e2fa4fe43 data/turtlematic/computercraft/turtle_upgrades/starbound_mason_automata.json 70387cb75032486cfa83f481d58e42f9da98ddc7 data/turtlematic/computercraft/turtle_upgrades/starbound_mercantile_automata.json diff --git a/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json new file mode 100644 index 0000000..19437e3 --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/creative_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:creative_fluidy_automata", + "item": "turtlematic:creative_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json new file mode 100644 index 0000000..b9cb5c0 --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:fluidy_automata", + "item": "turtlematic:fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json new file mode 100644 index 0000000..58db4c7 --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/netherite_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:netherite_fluidy_automata", + "item": "turtlematic:netherite_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json new file mode 100644 index 0000000..4b51ca5 --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/computercraft/turtle_upgrades/starbound_fluidy_automata.json @@ -0,0 +1,4 @@ +{ + "type": "turtlematic:starbound_fluidy_automata", + "item": "turtlematic:starbound_fluidy_automata_core" +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json b/projects/forge/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json new file mode 100644 index 0000000..8acc308 --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/recipes/netherite_fluidy_automata_core.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing", + "addition": { + "tag": "forge:ingots/netherite" + }, + "base": { + "item": "turtlematic:fluidy_automata_core" + }, + "result": { + "item": "turtlematic:netherite_fluidy_automata_core" + } +} \ No newline at end of file diff --git a/projects/forge/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json b/projects/forge/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json new file mode 100644 index 0000000..a19d09c --- /dev/null +++ b/projects/forge/src/generated/resources/data/turtlematic/recipes/starbound_fluidy_automata_core.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing", + "addition": { + "tag": "forge:nether_stars" + }, + "base": { + "item": "turtlematic:netherite_fluidy_automata_core" + }, + "result": { + "item": "turtlematic:starbound_fluidy_automata_core" + } +} \ No newline at end of file