Merge branch 'dev/0.8' into feat/keyboard

# Conflicts:
#	build.gradle
#	src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2
#	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
#	src/generated/resources/assets/advancedperipherals/lang/en_us.json
#	src/main/java/de/srendi/advancedperipherals/common/data/EnUsLanguageProvider.java
#	src/main/java/de/srendi/advancedperipherals/common/setup/APItems.java

Author: SirEndii

build.gradle

@@ -324,12 +324,14 @@ dependencies {
     compileOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
     compileOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
     // IMPORTANT. This should be removed/commented when running `runData`
-    /*runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
-    runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
-    runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
-    runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
-    runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
-     */
+    // Automated now, tho if you are not executing runData directly it's no help
+    if (!project.gradle.startParameter.taskNames.contains("runData")) {
+        runtimeOnly fg.deobf("com.ldtteam:minecolonies:${minecolonies_version}")
+        runtimeOnly fg.deobf("com.ldtteam:structurize:${structurize_version}")
+        runtimeOnly fg.deobf("com.ldtteam:multipiston:${multipiston_version}")
+        runtimeOnly fg.deobf("com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal")
+        runtimeOnly fg.deobf("com.ldtteam:blockui:${blockui_version}")
+    }
 
     // Patchouli
     compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}")

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.19.2	2024-09-25T15:15:12.3008086	Languages: en_us
-c5dde7701295d5ad506663dba947865df73d753c assets/advancedperipherals/lang/en_us.json
+// 1.19.2	2025-01-16T15:59:34.693839	Languages: en_us
+d0fe3ab5a88d6b925369860038c76f23d9910143 assets/advancedperipherals/lang/en_us.json

src/generated/resources/.cache/f95c7003282837dabaa33e3ffceec4e6865b5218

@@ -1,4 +1,4 @@
-// 1.19.2	2024-05-28T14:53:16.656337	Block tags
+// 1.19.2	2025-01-16T15:46:41.859383	Block tags
 e1f71dcb4f9e7e36e29b0ad09d6520dc3adfa4a6 data/forge/tags/blocks/needs_wood_tool.json
-ef4684e10e5054e8cfd515dffa4a98169d281078 data/minecraft/tags/blocks/mineable/pickaxe.json
-8de9358ffeaa8d5f015774f70244a93b915427b8 data/minecraft/tags/blocks/needs_iron_tool.json
+03322cd493601129eaad6ba7c2a6d808023dfac1 data/minecraft/tags/blocks/mineable/pickaxe.json
+277fe59db076a3eab3c97080531ad345f8ca5f3d data/minecraft/tags/blocks/needs_iron_tool.json

src/generated/resources/assets/advancedperipherals/lang/en_us.json

@@ -2,19 +2,19 @@
   "advancedperipherals.name": "Advanced Peripherals",
   "advancements.advancedperipherals.base_toolkit": "Gentleman's set!",
   "advancements.advancedperipherals.base_toolkit.description": "Collect a redstone integrator, inventory manager and energy detector. How did you even play without this?",
-  "advancements.advancedperipherals.end_automata_core": "End automata core",
+  "advancements.advancedperipherals.end_automata_core": "End Automata Core",
   "advancements.advancedperipherals.end_automata_core.description": "If you can code gps-free position location with this, you're a powerful human being",
-  "advancements.advancedperipherals.husbandry_automata_core": "Husbandry automata core",
+  "advancements.advancedperipherals.husbandry_automata_core": "Husbandry Automata Core",
   "advancements.advancedperipherals.husbandry_automata_core.description": "Is this core gluten-free?",
   "advancements.advancedperipherals.nbt_toolkit": "No secrets",
   "advancements.advancedperipherals.nbt_toolkit.description": "Collect a NBT storage and block reader. Now, all the world's secrets are open to you!",
-  "advancements.advancedperipherals.overpowered_automata_core": "Overpowered automata core",
+  "advancements.advancedperipherals.overpowered_automata_core": "Overpowered Automata Core",
   "advancements.advancedperipherals.overpowered_automata_core.description": "Can you handle so much power?",
   "advancements.advancedperipherals.root": "Advanced Peripherals",
   "advancements.advancedperipherals.root.description": "Every journey starts with the first block",
   "advancements.advancedperipherals.sense_toolkit": "The truth can't hide forever",
   "advancements.advancedperipherals.sense_toolkit.description": "Collect a geo scanner and environmental detector. There are no limits for observability!",
-  "advancements.advancedperipherals.weak_automata_core": "First automata core",
+  "advancements.advancedperipherals.weak_automata_core": "First Automata Core",
   "advancements.advancedperipherals.weak_automata_core.description": "Does the afterlife exist in minecraft?",
   "block.advancedperipherals.block_reader": "Block Reader",
   "block.advancedperipherals.chat_box": "Chat Box",
@@ -33,13 +33,12 @@
   "block.advancedperipherals.redstone_integrator": "Redstone Integrator",
   "block.advancedperipherals.rs_bridge": "RS Bridge",
   "curios.identifier.glasses": "Glasses",
-  "entity.minecraft.villager.advancedperipherals.advancedperipherals:computer_scientist": "Computer Scientist",
+  "entity.minecraft.villager.advancedperipherals.computer_scientist": "Computer Scientist",
   "item.advancedperipherals.chunk_controller": "Chunk Controller",
   "item.advancedperipherals.computer_tool": "Computer Tool",
   "item.advancedperipherals.end_automata_core": "End Automata Core",
   "item.advancedperipherals.hotkey_module": "Hotkey Module",
   "item.advancedperipherals.husbandry_automata_core": "Husbandry Automata Core",
-  "item.advancedperipherals.keyboard": "Keyboard",
   "item.advancedperipherals.memory_card": "Memory Card",
   "item.advancedperipherals.nightvision_module": "Night Vision Module",
   "item.advancedperipherals.overlay_module": "Overlay Module",
@@ -49,8 +48,6 @@
   "item.advancedperipherals.smart_glasses": "Smart Glasses",
   "item.advancedperipherals.smart_glasses_interface": "Smart Glasses Interface",
   "item.advancedperipherals.smart_glasses_netherite": "Netherite reinforced Smart Glasses",
-  "item.advancedperipherals.tooltip.binding.bound_to": "&7Bound to &b%s&7.",
-  "item.advancedperipherals.tooltip.binding.bound_to_glasses": "&7Bound to Smart Glasses with Id &b%s&7.",
   "item.advancedperipherals.tooltip.block_reader": "&7Reads nbt data of blocks to interact with blocks which do not have computer support.",
   "item.advancedperipherals.tooltip.chat_box": "&7Interacts with the ingame chat, can read and write messages.",
   "item.advancedperipherals.tooltip.chunk_controller": "&7A crafting ingredient for the Chunky Turtle.",
@@ -63,14 +60,14 @@
   "item.advancedperipherals.tooltip.geo_scanner": "&7Scans the area around it to find some shiny ores.",
   "item.advancedperipherals.tooltip.husbandry_automata_core": "&7Upgrade for turtles, that allows basic and advanced interactions with animals.",
   "item.advancedperipherals.tooltip.inventory_manager": "&7This block is able to send or receive specific items from a player inventory.",
-  "item.advancedperipherals.tooltip.keyboard": "&7Can be bound to a computer, used to type something on a computer without the need to open the computer.",
   "item.advancedperipherals.tooltip.me_bridge": "&7The ME Bridge interacts with Applied Energistics to manage your items.",
   "item.advancedperipherals.tooltip.memory_card": "&7Can save the rights of a player to use it in an inventory manager.",
+  "item.advancedperipherals.tooltip.memory_card.bound": "&7Bound to &b%s&7.",
   "item.advancedperipherals.tooltip.nbt_storage": "&7Acts like a storage disk. Can store nbt based data.",
   "item.advancedperipherals.tooltip.overpowered_end_automata_core": "&7Improved version of the end automata core, that provides some overpowered uses! Be careful, the upgrade is very fragile.",
   "item.advancedperipherals.tooltip.overpowered_husbandry_automata_core": "&7Improved version of the husbandry automata core, that provides some overpowered uses! Be careful, the upgrade is very fragile.",
   "item.advancedperipherals.tooltip.overpowered_weak_automata_core": "&7Improved version of the weak automata core, that provides some overpowered uses! Be careful, the upgrade is very fragile.",
-  "item.advancedperipherals.tooltip.peripheral_casing": "&7An empty hull without the love it deserves. Used as crafting ingredient.",
+  "item.advancedperipherals.tooltip.peripheral_casing": "&7An empty hull without the love it deserves. Used as crafting ingredient",
   "item.advancedperipherals.tooltip.player_detector": "&7This peripheral can be used to interact with players, but don't be a stalker.",
   "item.advancedperipherals.tooltip.redstone_integrator": "&7This block is able to interact with redstone. Works exactly like the redstone api of an computer.",
   "item.advancedperipherals.tooltip.rs_bridge": "&7The RS Bridge interacts with Refined Storage to manage your items.",
@@ -85,27 +82,23 @@
   "pocket.advancedperipherals.environment_pocket": "Environment",
   "pocket.advancedperipherals.geoscanner_pocket": "Geo",
   "pocket.advancedperipherals.player_pocket": "Player Detector",
-  "text.advancedperipherals.automata_core_feed_by_player": "You're trying to feed an entity to a soul, but your own body refuses to do this. Maybe something more mechanical can do this?",
-  "text.advancedperipherals.bind_keyboard": "&7Bound to &b%s&7",
-  "text.advancedperipherals.bind_memorycard": "&7Added you to the memory card",
-  "text.advancedperipherals.cleared_keyboard": "&7Bind removed",
-  "text.advancedperipherals.cleared_memorycard": "&7Cleared the memory card",
-  "text.advancedperipherals.could_not_bind_keyboard": "&cCould not bind the keyboard to the computer located at &c%s",
-  "text.advancedperipherals.keyboard_notbound": "&7Keyboard not bound",
-  "text.advancedperipherals.saddle_turtle_dismount_hint": "Controlling %1$s. Press %2$s and %3$s to dismount.",
+  "text.advancedperipherals.added_player": "Added you to the memory card",
+  "text.advancedperipherals.automata_core.feed_by_player": "You're trying to feed an entity to a soul, but your own body refuses to do this. Maybe something more mechanical can do this?",
+  "text.advancedperipherals.removed_player": "Cleared the memory card",
+  "text.advancedperipherals.saddle_turtle.dismount_hint": "Controlling %1$s. Press %2$s and %3$s to dismount.",
   "text.advancedperipherals.smart_glasses.modules": "Modules",
   "text.advancedperipherals.smart_glasses.peripherals": "Peripherals",
   "turtle.advancedperipherals.chatty_turtle": "Chatty",
   "turtle.advancedperipherals.chunky_turtle": "Chunky",
   "turtle.advancedperipherals.compass_turtle": "Compass",
-  "turtle.advancedperipherals.end_automata": "End automata",
+  "turtle.advancedperipherals.end_automata": "End Automata",
   "turtle.advancedperipherals.environment_turtle": "Environment",
   "turtle.advancedperipherals.geoscanner_turtle": "Geo",
-  "turtle.advancedperipherals.husbandry_automata": "Husbandry automata",
-  "turtle.advancedperipherals.overpowered_end_automata": "Overpowered end automata",
-  "turtle.advancedperipherals.overpowered_husbandry_automata": "Overpowered husbandry automata",
-  "turtle.advancedperipherals.overpowered_weak_automata": "Overpowered weak automata",
+  "turtle.advancedperipherals.husbandry_automata": "Husbandry Automata",
+  "turtle.advancedperipherals.overpowered_end_automata": "Overpowered End Automata",
+  "turtle.advancedperipherals.overpowered_husbandry_automata": "Overpowered Husbandry Automata",
+  "turtle.advancedperipherals.overpowered_weak_automata": "Overpowered Weak Automata",
   "turtle.advancedperipherals.player_turtle": "Player Detector",
   "turtle.advancedperipherals.saddle_turtle": "Saddle",
-  "turtle.advancedperipherals.weak_automata": "Weak automata"
+  "turtle.advancedperipherals.weak_automata": "Weak Automata"
 }

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -1,20 +1,20 @@
 {
   "values": [
-    "advancedperipherals:environment_detector",
+    "advancedperipherals:block_reader",
     "advancedperipherals:chat_box",
-    "advancedperipherals:player_detector",
-    "advancedperipherals:me_bridge",
-    "advancedperipherals:rs_bridge",
+    "advancedperipherals:colony_integrator",
+    "advancedperipherals:distance_detector",
     "advancedperipherals:energy_detector",
+    "advancedperipherals:environment_detector",
     "advancedperipherals:fluid_detector",
     "advancedperipherals:gas_detector",
-    "advancedperipherals:peripheral_casing",
-    "advancedperipherals:inventory_manager",
-    "advancedperipherals:redstone_integrator",
-    "advancedperipherals:block_reader",
     "advancedperipherals:geo_scanner",
-    "advancedperipherals:colony_integrator",
+    "advancedperipherals:inventory_manager",
+    "advancedperipherals:me_bridge",
     "advancedperipherals:nbt_storage",
-    "advancedperipherals:distance_detector"
+    "advancedperipherals:peripheral_casing",
+    "advancedperipherals:player_detector",
+    "advancedperipherals:redstone_integrator",
+    "advancedperipherals:rs_bridge"
   ]
 }

src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -1,19 +1,19 @@
 {
   "values": [
-    "advancedperipherals:environment_detector",
+    "advancedperipherals:block_reader",
     "advancedperipherals:chat_box",
-    "advancedperipherals:player_detector",
-    "advancedperipherals:me_bridge",
-    "advancedperipherals:rs_bridge",
+    "advancedperipherals:colony_integrator",
+    "advancedperipherals:distance_detector",
     "advancedperipherals:energy_detector",
+    "advancedperipherals:environment_detector",
     "advancedperipherals:fluid_detector",
     "advancedperipherals:gas_detector",
-    "advancedperipherals:inventory_manager",
-    "advancedperipherals:redstone_integrator",
-    "advancedperipherals:block_reader",
     "advancedperipherals:geo_scanner",
-    "advancedperipherals:colony_integrator",
+    "advancedperipherals:inventory_manager",
+    "advancedperipherals:me_bridge",
     "advancedperipherals:nbt_storage",
-    "advancedperipherals:distance_detector"
+    "advancedperipherals:player_detector",
+    "advancedperipherals:redstone_integrator",
+    "advancedperipherals:rs_bridge"
   ]
 }

src/main/java/de/srendi/advancedperipherals/client/screens/SaddleTurtleScreen.java

@@ -124,7 +124,7 @@ private void renderDismountHint(PoseStack stack) {
         Minecraft minecraft = Minecraft.getInstance();
         Component name = Component.translatable("block.computercraft.turtle_normal.upgraded", Component.translatable("turtle.advancedperipherals.saddle_turtle"));
         // TODO: get and render turtle's label if exists
-        Component text = Component.translatable("text.advancedperipherals.saddle_turtle_dismount_hint",
+        Component text = Component.translatable("text.advancedperipherals.saddle_turtle.dismount_hint",
             name, minecraft.options.keyShift.getTranslatedKeyMessage(), minecraft.options.keyInventory.getTranslatedKeyMessage());
         float top = 10;
         float x = (float)(this.screenWidth / 2 - textWidth(text) / 2);

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

@@ -402,7 +402,7 @@ public static Map<String, Object> parseCraftingCPU(ICraftingCPU cpu, boolean rec
 
     public static Map<String, Object> parseCraftingJob(CraftingJobStatus job, @Nullable ICraftingCPU cpu) {
         Map<String, Object> map = new HashMap<>();
-        map.put("storage", parseGenericStack(job.crafting()));
+        map.put("requestedItem", parseGenericStack(job.crafting()));
         map.put("elapsedTimeNanos", job.elapsedTimeNanos());
         map.put("totalItem", job.totalItems());
         map.put("progress", job.progress());

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/operations/SingleOperation.java

@@ -10,6 +10,7 @@
 public enum SingleOperation implements IPeripheralOperation<SingleOperationContext> {
     DIG(1000, 1),
     USE_ON_BLOCK(5000, 1),
+    UPDATE_BLOCK(500, 1),
     SUCK(1000, 1),
     USE_ON_ANIMAL(2500, 10),
     CAPTURE_ANIMAL(50_000, 100),

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/BlockEntityPeripheralOwner.java

@@ -1,5 +1,6 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.owner;
 
+import dan200.computercraft.api.peripheral.IPeripheral;
 import de.srendi.advancedperipherals.common.blocks.base.BaseBlock;
 import de.srendi.advancedperipherals.common.blocks.blockentities.InventoryManagerEntity;
 import de.srendi.advancedperipherals.common.util.DataStorageUtil;
@@ -20,7 +21,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
-import java.util.function.Function;
 
 public class BlockEntityPeripheralOwner<T extends BlockEntity & IPeripheralTileEntity> extends BasePeripheralOwner {
 
@@ -90,7 +90,7 @@ public void markDataStorageDirty() {
     }
 
     @Override
-    public <T1> T1 withPlayer(Function<APFakePlayer, T1> function) {
+    public <T1> T1 withPlayer(APFakePlayer.Action<T1> function) {
         throw new NotImplementedException();
     }
 
@@ -124,4 +124,9 @@ public BlockEntityPeripheralOwner<T> attachFuel() {
         attachAbility(PeripheralOwnerAbility.FUEL, new TileEntityFuelAbility<>(this));
         return this;
     }
+
+    @Override
+    public <U extends IPeripheral> U getConnectedPeripheral(Class<U> type) {
+        throw new NotImplementedException();
+    }
 }