Merge branch 'mc-1.19.x' into mc-1.20.x

projects/fabric/src/client/java/dan200/computercraft/client/ComputerCraftClient.java

@@ -4,11 +4,14 @@
 
 package dan200.computercraft.client;
 
+import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.model.EmissiveComputerModel;
 import dan200.computercraft.client.model.turtle.TurtleModelLoader;
 import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.config.ConfigSpec;
 import dan200.computercraft.shared.network.client.ClientNetworkContext;
 import dan200.computercraft.shared.peripheral.modem.wired.CableBlock;
+import dan200.computercraft.shared.platform.FabricConfigFile;
 import dan200.computercraft.shared.platform.NetworkHandler;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -17,6 +20,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.client.player.ClientPickBlockGatherCallback;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.item.ItemStack;
@@ -68,5 +72,7 @@ public class ComputerCraftClient {
 
             return cable.getCloneItemStack(state, hit, level, pos, player);
         });
+
+        ((FabricConfigFile) ConfigSpec.clientSpec).load(FabricLoader.getInstance().getConfigDir().resolve(ComputerCraftAPI.MOD_ID + "-client.toml"));
     }
 }

projects/fabric/src/generated/resources/assets/computercraft/lang/en_us.json

@@ -81,6 +81,8 @@
   "gui.computercraft.config.default_computer_settings.tooltip": "A comma separated list of default system settings to set on new computers.\nExample: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\"\nwill disable all autocompletion.",
   "gui.computercraft.config.disable_lua51_features": "Disable Lua 5.1 features",
   "gui.computercraft.config.disable_lua51_features.tooltip": "Set this to true to disable Lua 5.1 functions that will be removed in a future\nupdate. Useful for ensuring forward compatibility of your programs now.",
+  "gui.computercraft.config.disabled_generic_methods": "Disabled generic methods",
+  "gui.computercraft.config.disabled_generic_methods.tooltip": "A list of generic methods or method sources to disable. Generic methods are\nmethods added to a block/block entity when there is no explicit peripheral\nprovider. This includes inventory methods (i.e. inventory.getItemDetail,\ninventory.pushItems), and (if on Forge), the fluid_storage and energy_storage\nmethods.\nMethods in this list can either be a whole group of methods (computercraft:inventory)\nor a single method (computercraft:inventory#pushItems).\n",
   "gui.computercraft.config.execution": "Execution",
   "gui.computercraft.config.execution.computer_threads": "Computer threads",
   "gui.computercraft.config.execution.computer_threads.tooltip": "Set the number of threads computers can run on. A higher number means more\ncomputers can run at once, but may induce lag. Please note that some mods may\nnot work with a thread count higher than 1. Use with caution.\nRange: > 1",
@@ -204,6 +206,10 @@
   "item.computercraft.printed_pages": "Printed Pages",
   "item.computercraft.treasure_disk": "Floppy Disk",
   "itemGroup.computercraft": "ComputerCraft",
+  "tag.item.computercraft.computer": "Computers",
+  "tag.item.computercraft.monitor": "Monitors",
+  "tag.item.computercraft.turtle": "Turtles",
+  "tag.item.computercraft.wired_modem": "Wired modems",
   "tracking_field.computercraft.avg": "%s (avg)",
   "tracking_field.computercraft.computer_tasks.name": "Tasks",
   "tracking_field.computercraft.count": "%s (count)",

projects/fabric/src/main/java/dan200/computercraft/shared/ComputerCraft.java

@@ -29,7 +29,6 @@ import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.fabricmc.fabric.api.loot.v2.LootTableEvents;
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
@@ -98,8 +97,6 @@ public class ComputerCraft {
 
         CommonHooks.onDatapackReload((name, listener) -> ResourceManagerHelper.get(PackType.SERVER_DATA).registerReloadListener(new ReloadListener(name, listener)));
 
-        ((FabricConfigFile) ConfigSpec.clientSpec).load(FabricLoader.getInstance().getConfigDir().resolve(ComputerCraftAPI.MOD_ID + "-client.toml"));
-
         FabricDetailRegistries.FLUID_VARIANT.addProvider(FluidDetails::fill);
 
         ComputerCraftAPI.registerGenericSource(new InventoryMethods());

projects/fabric/src/main/java/dan200/computercraft/shared/platform/PlatformHelperImpl.java

@@ -5,6 +5,7 @@
 package dan200.computercraft.shared.platform;
 
 import com.google.auto.service.AutoService;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.arguments.ArgumentType;
@@ -28,6 +29,7 @@ import net.fabricmc.fabric.api.lookup.v1.block.BlockApiCache;
 import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup;
 import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
+import net.fabricmc.fabric.api.resource.conditions.v1.DefaultResourceConditions;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditions;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
 import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType;
@@ -50,6 +52,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.tags.TagKey;
+import net.minecraft.util.GsonHelper;
 import net.minecraft.world.Container;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -135,6 +138,17 @@ public class PlatformHelperImpl implements PlatformHelper {
         return ResourceConditions.objectMatchesConditions(object);
     }
 
+    @Override
+    public void addRequiredModCondition(JsonObject object, String modId) {
+        var conditions = GsonHelper.getAsJsonArray(object, ResourceConditions.CONDITIONS_KEY, null);
+        if (conditions == null) {
+            conditions = new JsonArray();
+            object.add(ResourceConditions.CONDITIONS_KEY, conditions);
+        }
+
+        conditions.add(DefaultResourceConditions.allModsLoaded(modId).toJson());
+    }
+
     @Override
     public <T extends BlockEntity> BlockEntityType<T> createBlockEntityType(BiFunction<BlockPos, BlockState, T> factory, Block block) {
         return FabricBlockEntityTypeBuilder.create(factory::apply).addBlock(block).build();

projects/fabric/src/main/resources/fabric.mod.json

@@ -31,6 +31,9 @@
         ],
         "rei_client": [
             "dan200.computercraft.client.integration.rei.REIComputerCraft"
+        ],
+        "emi": [
+            "dan200.computercraft.client.integration.emi.EMIComputerCraft"
         ]
     },
     "mixins": [