Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MariaTheDinkus/cc-tweaked-fabric
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.91.1-beta
Choose a base ref
...
head repository: MariaTheDinkus/cc-tweaked-fabric
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fabric
Choose a head ref
Loading
Showing with 2,682 additions and 584 deletions.
  1. +33 −0 .github/workflows/main-ci.yml
  2. +1 −0 .gitignore
  3. +3 −0 .vscode/settings.json
  4. +4 −6 README.md
  5. +5 −1 build.gradle
  6. +5 −5 gradle.properties
  7. +313 −0 patchwork.md
  8. +16 −11 src/main/java/dan200/computercraft/ComputerCraft.java
  9. +5 −4 src/main/java/dan200/computercraft/api/turtle/FakePlayer.java
  10. +1 −1 src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
  11. +1 −1 src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
  12. +1 −1 src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
  13. +19 −29 src/main/java/dan200/computercraft/client/render/ModelTransformer.java
  14. +4 −3 src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
  15. +0 −167 src/main/java/dan200/computercraft/core/apis/AddressPredicate.java
  16. +5 −4 src/main/java/dan200/computercraft/core/apis/http/CheckUrl.java
  17. +17 −1 src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
  18. +19 −8 src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java
  19. +6 −2 src/main/java/dan200/computercraft/core/apis/http/options/AddressRuleConfig.java
  20. +1 −1 src/main/java/dan200/computercraft/core/apis/http/request/HttpRequest.java
  21. +1 −1 src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
  22. +1 −1 src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java
  23. +1 −1 src/main/java/dan200/computercraft/mixin/MixinWorld.java
  24. +2 −2 src/main/java/dan200/computercraft/shared/BundledRedstone.java
  25. +8 −2 src/main/java/dan200/computercraft/shared/ComputerCraftRegistry.java
  26. +3 −2 src/main/java/dan200/computercraft/shared/Peripherals.java
  27. +1 −1 src/main/java/dan200/computercraft/shared/command/CommandUtils.java
  28. +2 −3 src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java
  29. +0 −3 src/main/java/dan200/computercraft/shared/network/NetworkMessage.java
  30. +2 −1 src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java
  31. +78 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheral.java
  32. +45 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralProvider.java
  33. +58 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
  34. +39 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/data/BlockData.java
  35. +54 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/data/DataHelpers.java
  36. +155 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java
  37. +37 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/methods/ArgumentHelpers.java
  38. +292 −0 src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java
  39. +1 −1 src/main/java/dan200/computercraft/shared/peripheral/monitor/ClientMonitor.java
  40. +1 −2 src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java
  41. +5 −7 src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
  42. +2 −1 src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
  43. +2 −15 src/main/java/dan200/computercraft/shared/turtle/core/TurtleInspectCommand.java
  44. +2 −2 src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java
  45. +17 −43 src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
  46. +35 −12 src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
  47. +1 −1 src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
  48. +1 −3 src/main/java/dan200/computercraft/shared/util/Config.java
  49. +0 −2 src/main/java/dan200/computercraft/shared/util/DropConsumer.java
  50. +20 −47 src/main/java/dan200/computercraft/shared/util/FakeNetHandler.java
  51. +36 −3 src/main/java/dan200/computercraft/shared/util/InventoryUtil.java
  52. +18 −0 src/main/java/dan200/computercraft/shared/util/ItemStorage.java
  53. +29 −0 src/main/java/dan200/computercraft/shared/util/ServiceUtil.java
  54. +1 −1 src/main/java/dan200/computercraft/shared/util/WorldUtil.java
  55. +74 −3 src/main/resources/assets/computercraft/lang/sv_se.json
  56. +48 −0 src/main/resources/assets/computercraft/lang/vi.json
  57. +19 −10 src/main/resources/assets/computercraft/lua/rom/programs/motd.lua
  58. +4 −4 src/main/resources/assets/computercraft/shaders/monitor.frag
  59. +4 −4 src/main/resources/computercraft.mixins.json
  60. +168 −25 src/main/resources/data/computercraft/lua/rom/apis/colors.lua
  61. +1 −1 src/main/resources/data/computercraft/lua/rom/apis/disk.lua
  62. +1 −1 src/main/resources/data/computercraft/lua/rom/apis/help.lua
  63. +1 −1 src/main/resources/data/computercraft/lua/rom/apis/io.lua
  64. +1 −0 src/main/resources/data/computercraft/lua/rom/apis/keys.lua
  65. +47 −51 src/main/resources/data/computercraft/lua/rom/apis/paintutils.lua
  66. +1 −1 src/main/resources/data/computercraft/lua/rom/apis/peripheral.lua
  67. +22 −15 src/main/resources/data/computercraft/lua/rom/apis/textutils.lua
  68. +10 −2 src/main/resources/data/computercraft/lua/rom/apis/window.lua
  69. +2 −2 src/main/resources/data/computercraft/lua/rom/modules/main/cc/completion.lua
  70. +2 −2 src/main/resources/data/computercraft/lua/rom/modules/main/cc/pretty.lua
  71. +1 −1 src/main/resources/data/computercraft/lua/rom/modules/main/cc/shell/completion.lua
  72. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/alias.lua
  73. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/cd.lua
  74. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/command/exec.lua
  75. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/copy.lua
  76. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/delete.lua
  77. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/edit.lua
  78. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/eject.lua
  79. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
  80. +4 −3 src/main/resources/data/computercraft/lua/rom/programs/fun/dj.lua
  81. +4 −3 src/main/resources/data/computercraft/lua/rom/programs/gps.lua
  82. +4 −3 src/main/resources/data/computercraft/lua/rom/programs/http/pastebin.lua
  83. +3 −2 src/main/resources/data/computercraft/lua/rom/programs/http/wget.lua
  84. +8 −6 src/main/resources/data/computercraft/lua/rom/programs/label.lua
  85. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/mkdir.lua
  86. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/monitor.lua
  87. +19 −10 src/main/resources/data/computercraft/lua/rom/programs/motd.lua
  88. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/move.lua
  89. +3 −2 src/main/resources/data/computercraft/lua/rom/programs/rednet/chat.lua
  90. +5 −4 src/main/resources/data/computercraft/lua/rom/programs/redstone.lua
  91. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/rename.lua
  92. +2 −2 src/main/resources/data/computercraft/lua/rom/programs/shell.lua
  93. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/craft.lua
  94. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/equip.lua
  95. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/excavate.lua
  96. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/go.lua
  97. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/refuel.lua
  98. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/tunnel.lua
  99. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/turn.lua
  100. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/turtle/unequip.lua
  101. +2 −1 src/main/resources/data/computercraft/lua/rom/programs/type.lua
  102. +6 −3 src/main/resources/fabric.mod.json
  103. +34 −0 src/test/java/dan200/computercraft/core/apis/options/AddressRuleTest.java
  104. +16 −0 src/test/resources/test-rom/spec/apis/colors_spec.lua
  105. +103 −0 src/test/resources/test-rom/spec/apis/paintutils_spec.lua
  106. +50 −0 src/test/resources/test-rom/spec/apis/window_spec.lua
  107. +33 −0 src/test/resources/test-rom/spec/programs/command/exec_spec.lua
  108. +40 −0 src/test/resources/test-rom/spec/programs/copy_spec.lua
  109. +36 −0 src/test/resources/test-rom/spec/programs/motd_spec.lua
  110. +74 −0 src/test/resources/test-rom/spec/programs/move_spec.lua
  111. +69 −0 src/test/resources/test-rom/spec/programs/turtle/craft_spec.lua
  112. +89 −0 src/test/resources/test-rom/spec/programs/turtle/equip_spec.lua
  113. +62 −0 src/test/resources/test-rom/spec/programs/turtle/refuel_spec.lua
  114. +69 −0 src/test/resources/test-rom/spec/programs/turtle/unequip_spec.lua
  115. +48 −0 tools/check-lines.py
  116. +2 −0 tools/language.lua
  117. +42 −0 tools/language.py
33 changes: 33 additions & 0 deletions .github/workflows/main-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build

on: [push, pull_request]

jobs:
build:
name: Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Java 8
uses: actions/setup-java@v1
with:
java-version: 8

- name: Cache gradle dependencies
uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew build --no-daemon || ./gradlew build --no-daemon

- name: Upload Jar
uses: actions/upload-artifact@v1
with:
name: CC-Tweaked-Fabric
path: build/libs
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -15,3 +15,4 @@
.idea
.gradle
*.DS_Store
.project
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# CC:T for Fabric
# CC:Restitched Patchwork
# This is a Work In Progress Port
*it runs and works-ish*

* [Download on CurseForge](https://www.curseforge.com/minecraft/mc-mods/cc-tweaked-fabric)

A fork of [CC: Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) for use with the latest Fabric.

NOTE: This project is currently in alpha stage. It may not be well-tested and stable, so use it at your own peril!
PRs welcome
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'fabric-loom' version '0.6-SNAPSHOT'
id 'maven-publish'
}

@@ -13,6 +13,7 @@ archivesBaseName = "cc-tweaked-fabric-${mc_version}"

repositories {
mavenCentral()
jcenter()
maven {
name "SquidDev"
url "https://squiddev.cc/maven"
@@ -38,6 +39,9 @@ dependencies {
implementation "blue.endless:jankson:${jankson_version}"
implementation 'com.google.code.findbugs:jsr305:3.0.2'

compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'

include "me.shedaniel.cloth:config-2:${cloth_config_version}"
include "blue.endless:jankson:${jankson_version}"
include 'javax.vecmath:vecmath:1.5.2'
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@
org.gradle.jvmargs=-Xmx1G

# Mod properties
mod_version=1.91.1
mod_version=1.94.0

# Minecraft properties
mc_version=1.16.2
mappings_version=31
mc_version=1.16.5
mappings_version=5

# Dependencies
cloth_config_version=4.8.1
fabric_api_version=0.19.0+build.398-1.16
fabric_loader_version=0.9.2+build.206
fabric_api_version=0.32.0+1.16
fabric_loader_version=0.11.3
jankson_version=1.2.0
modmenu_version=1.14.6+
cloth_api_version=1.4.5
Loading