Merge pull request #31 from Jummit/new-textures

Update the textures to fit Jappa's style

README.md

@@ -7,6 +7,8 @@
 
 This is an fork of [Zundrel/cc-tweaked-fabric](https://github.com/Zundrel/cc-tweaked-fabric) who's goal was to port [SquidDev-CC/CC-Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) to fabric. I picked up maintaining the mod because the team working on Zundrel's fork, admitted they had gotten lazy so I picked it up to make it up to snuff with CC:T
 
+This mod includes textures that are more in-line with the style of Mojang's new texture-artist, Jappa. If you prefer the original textures, enable the "Programer Art" resource pack provided by the mod.
+
 ## Contributing
 Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC:R there are a few rules
 1) Any updates that port commits from CC:T, ***MUST*** follow the format defined in [patchwork.md](patchwork.md) otherwise they will not be accepted,

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -50,6 +50,8 @@ import net.minecraft.util.registry.Registry;
 
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.loader.api.FabricLoader;
 
 public final class ComputerCraft implements ModInitializer {
@@ -131,6 +133,9 @@ public final class ComputerCraft implements ModInitializer {
         Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "has_id"), HasComputerIdLootCondition.TYPE);
         init();
         GenericSource.setup( () -> ServiceUtil.loadServices( GenericSource.class ));
+        FabricLoader.getInstance().getModContainer(MOD_ID).ifPresent(modContainer -> {
+            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier(MOD_ID, "programmer_art"), modContainer, ResourcePackActivationType.NORMAL);
+        });
     }
 
 }

src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png.mcmeta

@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}

src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png.mcmeta

@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}

src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png.mcmeta

@@ -1,6 +1,6 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
+{
+  "animation": {
+    "frametime": 8,
+    "frames": [ 0, 1 ]
+  }
+}