diff --git a/build.gradle b/build.gradle index 5d72f5140..b998ce4ed 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,9 @@ } } dependencies { + classpath 'com.google.code.gson:gson:2.8.1' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1' classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0' } } @@ -93,7 +95,60 @@ from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) } } +import java.nio.charset.StandardCharsets +import java.nio.file.* +import java.util.zip.* + +import com.google.gson.GsonBuilder +import com.google.gson.JsonElement import org.ajoberstar.grgit.Grgit +import proguard.gradle.ProGuardTask + +task proguard(type: ProGuardTask, dependsOn: jar) { + description "Removes unused shadowed classes from the jar" + + injars jar.archivePath + outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar" + + // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size. + dontobfuscate; dontoptimize; keepattributes; keepparameternames + + // Proguard will remove directories by default, but that breaks JarMount. + keepdirectories 'assets/computercraft/lua**' + + // Preserve ComputerCraft classes - we only want to strip shadowed files. + keep 'class dan200.computercraft.** { *; }' + + // Preserve the constructors in Cobalt library class, as we init them via reflection + keepclassmembers 'class org.squiddev.cobalt.lib.** { (...); }' +} + +gradle.projectsEvaluated { + tasks.withType(ProGuardTask) { + group "compact" + + // Add the main runtime jar and all non-shadowed dependencies + libraryjars "${System.getProperty('java.home')}/lib/rt.jar" + sourceSets.main.compileClasspath + .filter { !it.name.contains("Cobalt") } + .each { libraryjars it } + } +} + +task proguardMove(dependsOn: proguard) { + description "Replace the original jar with the minified version" + group "compact" + + doLast { + Files.move( + file("${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar").toPath(), + file(jar.archivePath).toPath(), + StandardCopyOption.REPLACE_EXISTING + ) + } +} + +reobfJar.dependsOn proguardMove processResources { inputs.property "version", project.version @@ -129,6 +184,47 @@ } } +task compressJson(dependsOn: extractAnnotationsJar) { + group "compact" + description "Minifies all JSON files, stripping whitespace" + + def jarPath = file(jar.archivePath) + + def tempPath = File.createTempFile("input", ".jar", temporaryDir) + tempPath.deleteOnExit() + + def gson = new GsonBuilder().create() + + doLast { + // Copy over all files in the current jar to the new one, running json files from GSON. As pretty printing + // is turned off, they should be minified. + new ZipFile(jarPath).withCloseable { inJar -> + new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(tempPath))).withCloseable { outJar -> + inJar.entries().each { entry -> + if(entry.directory) { + outJar.putNextEntry(entry) + } else if(!entry.name.endsWith(".json")) { + outJar.putNextEntry(entry) + inJar.getInputStream(entry).withCloseable { outJar << it } + } else { + ZipEntry newEntry = new ZipEntry(entry.name) + newEntry.setTime(entry.time) + outJar.putNextEntry(newEntry) + + def element = inJar.getInputStream(entry).withCloseable { gson.fromJson(it.newReader("UTF8"), JsonElement.class) } + outJar.write(gson.toJson(element).getBytes(StandardCharsets.UTF_8)) + } + } + + } + } + + // And replace the original jar again + Files.move(tempPath.toPath(), jarPath.toPath(), StandardCopyOption.REPLACE_EXISTING) + } +} + +assemble.dependsOn compressJson curseforge { apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : '' diff --git a/src/main/resources/assets/computercraft/textures/blocks/cable_core.png b/src/main/resources/assets/computercraft/textures/blocks/cable_core.png index e9f3ea7bf..184b644c0 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/cable_core.png and b/src/main/resources/assets/computercraft/textures/blocks/cable_core.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/cable_side.png b/src/main/resources/assets/computercraft/textures/blocks/cable_side.png index b9411ce06..148adec7a 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/cable_side.png and b/src/main/resources/assets/computercraft/textures/blocks/cable_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png b/src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png index 551b04265..9b5a127a8 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png and b/src/main/resources/assets/computercraft/textures/blocks/command_computer_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/computer_front.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front.png index d2db75c4f..4c6210ddb 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/computer_front.png and b/src/main/resources/assets/computercraft/textures/blocks/computer_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png index f8942c64c..e8d7a458f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png and b/src/main/resources/assets/computercraft/textures/blocks/computer_front_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png b/src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png index 3ac154897..3d6f8cac6 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png and b/src/main/resources/assets/computercraft/textures/blocks/computer_front_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/computer_side.png b/src/main/resources/assets/computercraft/textures/blocks/computer_side.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/computer_side.png and b/src/main/resources/assets/computercraft/textures/blocks/computer_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/computer_top.png b/src/main/resources/assets/computercraft/textures/blocks/computer_top.png index 88e2ade78..932df74c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/computer_top.png and b/src/main/resources/assets/computercraft/textures/blocks/computer_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png b/src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png index 162778246..b569b62fc 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png and b/src/main/resources/assets/computercraft/textures/blocks/crafty_upgrade.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png index bf6c711f9..2a749d240 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png and b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png index 7b3d0d1fe..8dd30d905 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png and b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_accepted.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png index aa6fdf50b..2a71b664f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png and b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_front_rejected.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png and b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png index 88e2ade78..932df74c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png and b/src/main/resources/assets/computercraft/textures/blocks/disk_drive_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/modem_back.png b/src/main/resources/assets/computercraft/textures/blocks/modem_back.png index 05beaadf6..adec99735 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/modem_back.png and b/src/main/resources/assets/computercraft/textures/blocks/modem_back.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor0.png b/src/main/resources/assets/computercraft/textures/blocks/monitor0.png index 88e2ade78..932df74c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor0.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor0.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor1.png b/src/main/resources/assets/computercraft/textures/blocks/monitor1.png index e68335217..9b8e541b5 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor1.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor1.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor15.png b/src/main/resources/assets/computercraft/textures/blocks/monitor15.png index 705ada402..8f4c3e37f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor15.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor15.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor16.png b/src/main/resources/assets/computercraft/textures/blocks/monitor16.png index 4b1c67daf..3f007142c 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor16.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor16.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor2.png b/src/main/resources/assets/computercraft/textures/blocks/monitor2.png index c91c12804..3c6e465ec 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor2.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor2.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor20.png b/src/main/resources/assets/computercraft/textures/blocks/monitor20.png index 96844dc38..e65d6f6b7 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor20.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor20.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor3.png b/src/main/resources/assets/computercraft/textures/blocks/monitor3.png index cc723f26d..e42cd59c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor3.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor3.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor32.png b/src/main/resources/assets/computercraft/textures/blocks/monitor32.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor32.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor32.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor33.png b/src/main/resources/assets/computercraft/textures/blocks/monitor33.png index 0aa2c7a9d..881d99de8 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor33.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor33.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor34.png b/src/main/resources/assets/computercraft/textures/blocks/monitor34.png index 1c45f99fc..068a59ba6 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor34.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor34.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor35.png b/src/main/resources/assets/computercraft/textures/blocks/monitor35.png index a014b1a7a..87f763048 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor35.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor35.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor36.png b/src/main/resources/assets/computercraft/textures/blocks/monitor36.png index 34dd9ecb2..938501b40 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor36.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor36.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor37.png b/src/main/resources/assets/computercraft/textures/blocks/monitor37.png index 5b0ed965c..a970f8175 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor37.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor37.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor38.png b/src/main/resources/assets/computercraft/textures/blocks/monitor38.png index b2f798b9b..91f52201b 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor38.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor38.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor39.png b/src/main/resources/assets/computercraft/textures/blocks/monitor39.png index 1be067a7e..c0dc753b6 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor39.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor39.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor4.png b/src/main/resources/assets/computercraft/textures/blocks/monitor4.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor4.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor4.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor40.png b/src/main/resources/assets/computercraft/textures/blocks/monitor40.png index b1fcbf6a8..53b6811e3 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor40.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor40.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor41.png b/src/main/resources/assets/computercraft/textures/blocks/monitor41.png index f1defab75..79997fd0d 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor41.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor41.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor42.png b/src/main/resources/assets/computercraft/textures/blocks/monitor42.png index 0637fdc48..9053f3261 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor42.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor42.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor43.png b/src/main/resources/assets/computercraft/textures/blocks/monitor43.png index 981d3decb..95bbf5706 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor43.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor43.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor44.png b/src/main/resources/assets/computercraft/textures/blocks/monitor44.png index b437b5dc3..1b9270112 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor44.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor44.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor45.png b/src/main/resources/assets/computercraft/textures/blocks/monitor45.png index 30770c4fe..845e7fa93 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor45.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor45.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor46.png b/src/main/resources/assets/computercraft/textures/blocks/monitor46.png index 97c9fd35e..d4cc702af 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor46.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor46.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor47.png b/src/main/resources/assets/computercraft/textures/blocks/monitor47.png index d4b11c7f3..e2e08d5ef 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor47.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor47.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor5.png b/src/main/resources/assets/computercraft/textures/blocks/monitor5.png index b2f798b9b..91f52201b 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor5.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor5.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor6.png b/src/main/resources/assets/computercraft/textures/blocks/monitor6.png index 5b0ed965c..a970f8175 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor6.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor6.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/monitor7.png b/src/main/resources/assets/computercraft/textures/blocks/monitor7.png index 34dd9ecb2..938501b40 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/monitor7.png and b/src/main/resources/assets/computercraft/textures/blocks/monitor7.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png index 28cff888e..a3acf1b94 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_front_both_trays.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png index 2681f19b4..c057bf0ed 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_front_bottom_tray.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png index 7ce8d2f7e..166163ce9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_front_empty.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png b/src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png index d8c0f6115..94800919f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_front_top_tray.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_side.png b/src/main/resources/assets/computercraft/textures/blocks/printer_side.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_side.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/printer_top.png b/src/main/resources/assets/computercraft/textures/blocks/printer_top.png index 88e2ade78..932df74c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/printer_top.png and b/src/main/resources/assets/computercraft/textures/blocks/printer_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/speaker_front.png b/src/main/resources/assets/computercraft/textures/blocks/speaker_front.png index fc5b81ce3..8e89af73a 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/speaker_front.png and b/src/main/resources/assets/computercraft/textures/blocks/speaker_front.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/speaker_side.png b/src/main/resources/assets/computercraft/textures/blocks/speaker_side.png index 9aed498a5..55a1c633f 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/speaker_side.png and b/src/main/resources/assets/computercraft/textures/blocks/speaker_side.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/speaker_top.png b/src/main/resources/assets/computercraft/textures/blocks/speaker_top.png index 88e2ade78..932df74c9 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/speaker_top.png and b/src/main/resources/assets/computercraft/textures/blocks/speaker_top.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtle.png b/src/main/resources/assets/computercraft/textures/blocks/turtle.png index d2faaa05b..8e863ac96 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/turtle.png and b/src/main/resources/assets/computercraft/textures/blocks/turtle.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png index 48dd73d4a..b5b56118c 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/blocks/turtle_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtle_elf_overlay.png b/src/main/resources/assets/computercraft/textures/blocks/turtle_elf_overlay.png index 49a191ac6..00ebec95c 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/turtle_elf_overlay.png and b/src/main/resources/assets/computercraft/textures/blocks/turtle_elf_overlay.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtle_speaker_face.png b/src/main/resources/assets/computercraft/textures/blocks/turtle_speaker_face.png index 2b6f595b9..4fd45fffb 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/turtle_speaker_face.png and b/src/main/resources/assets/computercraft/textures/blocks/turtle_speaker_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/turtle_white.png b/src/main/resources/assets/computercraft/textures/blocks/turtle_white.png index 0050df1c4..e4d8d3a10 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/turtle_white.png and b/src/main/resources/assets/computercraft/textures/blocks/turtle_white.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png index 6680882d2..ad0deca0e 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png and b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png index 0e0fae6f1..14837c44c 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png and b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png index 451ed14e5..278193c21 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png and b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png index cfa77f579..71c108025 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png and b/src/main/resources/assets/computercraft/textures/blocks/wired_modem_face_peripheral_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png index 678f2ce17..a2b223816 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png and b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face.png differ diff --git a/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png index 328808350..cfbcb2909 100644 Binary files a/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png and b/src/main/resources/assets/computercraft/textures/blocks/wireless_modem_face_on.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/corners.png b/src/main/resources/assets/computercraft/textures/gui/corners.png index 7f68611be..be4cd974b 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/corners.png and b/src/main/resources/assets/computercraft/textures/gui/corners.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png b/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png index dcbf40679..12a080626 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png and b/src/main/resources/assets/computercraft/textures/gui/corners_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/corners_command.png b/src/main/resources/assets/computercraft/textures/gui/corners_command.png index fbb1fee6c..1bd3c311a 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/corners_command.png and b/src/main/resources/assets/computercraft/textures/gui/corners_command.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/diskdrive.png b/src/main/resources/assets/computercraft/textures/gui/diskdrive.png index 4227597e1..b4e5b9537 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/diskdrive.png and b/src/main/resources/assets/computercraft/textures/gui/diskdrive.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/printer.png b/src/main/resources/assets/computercraft/textures/gui/printer.png index 7e149088d..c3dd9af0f 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/printer.png and b/src/main/resources/assets/computercraft/textures/gui/printer.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/printout.png b/src/main/resources/assets/computercraft/textures/gui/printout.png index 135061d8e..7ae1abd35 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/printout.png and b/src/main/resources/assets/computercraft/textures/gui/printout.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/term_font.png b/src/main/resources/assets/computercraft/textures/gui/term_font.png index 4620fbe11..ef7119bc2 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/term_font.png and b/src/main/resources/assets/computercraft/textures/gui/term_font.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle.png b/src/main/resources/assets/computercraft/textures/gui/turtle.png index a9985e80d..4ac3eee08 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle.png and b/src/main/resources/assets/computercraft/textures/gui/turtle.png differ diff --git a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png index 9bfe10381..3bad07e00 100644 Binary files a/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png and b/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png differ diff --git a/src/main/resources/assets/computercraft/textures/items/book.png b/src/main/resources/assets/computercraft/textures/items/book.png index 459892daa..fb3cd3a9e 100644 Binary files a/src/main/resources/assets/computercraft/textures/items/book.png and b/src/main/resources/assets/computercraft/textures/items/book.png differ diff --git a/src/main/resources/assets/computercraft/textures/items/pocket_computer.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer.png index 16757c61e..0f7099ee6 100644 Binary files a/src/main/resources/assets/computercraft/textures/items/pocket_computer.png and b/src/main/resources/assets/computercraft/textures/items/pocket_computer.png differ diff --git a/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png index ccbfe7510..a8de56127 100644 Binary files a/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png and b/src/main/resources/assets/computercraft/textures/items/pocket_computer_blink.png differ diff --git a/src/main/resources/assets/computercraft/textures/items/pocket_computer_colour.png b/src/main/resources/assets/computercraft/textures/items/pocket_computer_colour.png index 8055d0c7c..3a296f8f6 100644 Binary files a/src/main/resources/assets/computercraft/textures/items/pocket_computer_colour.png and b/src/main/resources/assets/computercraft/textures/items/pocket_computer_colour.png differ diff --git a/src/main/resources/pack.png b/src/main/resources/pack.png index 1832d080d..3e4611663 100644 Binary files a/src/main/resources/pack.png and b/src/main/resources/pack.png differ