Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port OpenComputers to Minecraft 1.16.5 #3572

Open
wants to merge 160 commits into
base: master-MC1.16
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
d7cd148
Upgrade gradle to Minecraft 1.16.5
KosmosPrime May 1, 2022
330f7a1
Upgrade to Minecraft 1.16.5 mod format
KosmosPrime May 1, 2022
c6d90d9
Update dependencies to MC 1.16.5 versions
KosmosPrime May 7, 2022
05587c3
Upgrade code to Minecraft 1.16.5
KosmosPrime Jul 25, 2022
3271284
Upgrade codebase to Scala 2.12
KosmosPrime Jul 25, 2022
2dc2f89
Fix mods.toml using incorrect forge version
KosmosPrime Jul 25, 2022
56ce2ad
Make OpenComputers a constructable mod class
KosmosPrime Jul 25, 2022
54efa48
Move block and item creation to correct events
KosmosPrime Jul 25, 2022
f021125
Fix crash due to missing Settings instance
KosmosPrime Jul 25, 2022
5dcf92c
Fix crash due to hard dependency on AE2
KosmosPrime Jul 25, 2022
6491940
Fix crash due to hard dependency on ProjectRed
KosmosPrime Jul 25, 2022
1e30bbf
Fix crash due to illegal resource name
KosmosPrime Jul 25, 2022
790f9f6
Fix crash due to changed property ABI
KosmosPrime Jul 25, 2022
16d0351
Fix crash because of wrong initialization order
KosmosPrime Jul 26, 2022
2c6fa8b
Create EntityType for Drone
KosmosPrime Jul 26, 2022
48b7346
Create types for TileEntities
KosmosPrime Jul 27, 2022
1e6cea4
Make mod jar executable by embedding dependencies
KosmosPrime Jul 27, 2022
faf5a8e
Add missing irrefutable matches where applicable
KosmosPrime Jul 28, 2022
cf22c7f
Port language files to new JSON format
KosmosPrime Jul 28, 2022
2ab07d4
Remove item delegate system
KosmosPrime Jul 29, 2022
ac3d9b2
Upgrade block models and items
KosmosPrime Jul 31, 2022
999b2b8
Fix CustomModel rendering for items
KosmosPrime Jul 31, 2022
05ddd39
Fix SideTracker's integrated server detection
KosmosPrime Aug 1, 2022
bf1e601
Use SRG names for ObfuscationReflectionHelper
KosmosPrime Aug 2, 2022
946df3a
Remove duplicate drone from creative menu
KosmosPrime Aug 2, 2022
b5e889e
Move event listeners to mod bus where required
KosmosPrime Aug 4, 2022
e317f28
Fix thread pools not getting created
KosmosPrime Aug 4, 2022
7233236
Fix custom block item rendering
KosmosPrime Aug 5, 2022
aa5d9ae
Fix block models not rendering
KosmosPrime Aug 6, 2022
7598f1c
Fix rendering crash due to pose stack growth
KosmosPrime Aug 6, 2022
9541743
Fix robot rendering crash due bad vertex format
KosmosPrime Aug 6, 2022
728eba0
Fix S->C packet error due to missing sender
KosmosPrime Aug 6, 2022
03215b4
Fix crash when creating file system from class
KosmosPrime Aug 6, 2022
0f2077d
Fix crash when calling protected Entity.setRot
KosmosPrime Aug 6, 2022
542b4eb
Fix robot rendering always on top
KosmosPrime Aug 6, 2022
e0a8b2b
Fix robot upgrade rendering
KosmosPrime Aug 6, 2022
faac8a1
Fix robot pet rendering
KosmosPrime Aug 7, 2022
d27c117
Fix item tooltip keybind and style
KosmosPrime Aug 7, 2022
6f53673
Fix MFU renderer misalignment
KosmosPrime Aug 8, 2022
d839afb
Fix keyboards not being placeable
KosmosPrime Aug 8, 2022
d3133ee
Fix keyboard block lighting
KosmosPrime Aug 8, 2022
de14235
Fix screens not connecting visually
KosmosPrime Aug 9, 2022
f1b26aa
Remove SimpleComponent functionality
KosmosPrime Aug 10, 2022
10b11fc
Port drone leash offset
KosmosPrime Aug 10, 2022
b138f80
Create types for containers
KosmosPrime Aug 14, 2022
5f28297
Register screen constructors for containers
KosmosPrime Aug 18, 2022
80328fa
Replace GuiHandler with networked containers
KosmosPrime Aug 24, 2022
71c215e
Fix regular GUIs not being closeable
KosmosPrime Sep 2, 2022
edc2b51
Fix Waypoint gui not being editable
KosmosPrime Sep 3, 2022
9127bfe
Fix Manual tab icon rendering
KosmosPrime Sep 3, 2022
3458c1a
Fix illegal ResourceLocation paths in Manual
KosmosPrime Sep 3, 2022
cdb10bd
Fix Manual rendering causing texture errors
KosmosPrime Sep 3, 2022
559db44
Fix Manual rendering of ore dictionary entries
KosmosPrime Sep 4, 2022
7d07ad2
Fix Manual rendering clipping incorrectly
KosmosPrime Sep 5, 2022
1eaa737
Fix Manual scrollbar not being visible
KosmosPrime Sep 5, 2022
291f269
Fix Manual buttons not working
KosmosPrime Sep 5, 2022
16d6f88
Fix DynamicFontRenderer crash
KosmosPrime Sep 5, 2022
9bccfc9
Fix crash due to unfinished batch rendering
KosmosPrime Sep 5, 2022
f8fb678
Remove damage-based item system from Manual
KosmosPrime Sep 5, 2022
864ae2b
Fix duplicate title rendering in inventories
KosmosPrime Sep 5, 2022
0823889
Fix drone rendering crash
KosmosPrime Sep 5, 2022
5abd0a7
Fix Rack interconnect rendering and buttons
KosmosPrime Sep 6, 2022
700bacd
Fix wrong highlighting and item ghosts in GUIs
KosmosPrime Sep 7, 2022
651b5ae
Fix tooltips not appearing in GUIs
KosmosPrime Sep 8, 2022
b2d948f
Add translations for creative tab and new keys
KosmosPrime Sep 8, 2022
7ce9adc
Fix progress bar hover detection
KosmosPrime Sep 8, 2022
1bb1421
Fix render glitches caused by tile renderers
KosmosPrime Sep 9, 2022
7306f08
Fix rack mountable interaction
KosmosPrime Sep 9, 2022
df79f2f
Fix screens not being closeable
KosmosPrime Sep 9, 2022
1db849c
Fix computer and robot GUI buffer rendering
KosmosPrime Sep 10, 2022
e2e3ae3
Reimplement rendering cache for TextBuffer
KosmosPrime Sep 11, 2022
43e9598
Fix Microcontroller TE not breaking properly
KosmosPrime Sep 14, 2022
256a32e
Fix signals sending player name as ITextComponent
KosmosPrime Sep 15, 2022
c24426a
Fix case contents dropping on block state change
KosmosPrime Sep 15, 2022
e269289
Fix native Lua not working in dev environment
KosmosPrime Sep 16, 2022
3567ef1
Fix loot disks having the wrong color
KosmosPrime Sep 16, 2022
dec53d1
Fix FS thread pool not getting created
KosmosPrime Sep 16, 2022
3ff63fd
Update key codes to match GLFW
KosmosPrime Sep 17, 2022
792999b
Fix robots cannot be turned on
KosmosPrime Sep 20, 2022
3b11f3b
Fix robot movement causing invalid TE
KosmosPrime Sep 20, 2022
d09a232
Fix robot container item placement rules
KosmosPrime Sep 20, 2022
2e58bf6
Fix robot container not being scrollable
KosmosPrime Sep 20, 2022
e41ef49
Make container slots host-aware
KosmosPrime Sep 20, 2022
f1f9f9b
Fix robot GUI item highlighting
KosmosPrime Sep 20, 2022
11a9c33
Fix quadcopter light rendering
KosmosPrime Sep 21, 2022
bfb9211
Fix drones not being interactible
KosmosPrime Sep 22, 2022
8967231
Fix Drone selection animation
KosmosPrime Sep 22, 2022
2e0816a
Fix Drone container crash on open
KosmosPrime Sep 22, 2022
bef2bb1
Fix drone physics and jittering
KosmosPrime Sep 22, 2022
95fffa8
Fix nanomachine GUI rendering
KosmosPrime Sep 22, 2022
c7c563a
Fix tablet highlight renderer bleeding state
KosmosPrime Sep 22, 2022
229a162
Fix 3d-print rendering in-world
KosmosPrime Sep 24, 2022
2c01b8b
Upgrade cable AABB bounds to VoxelShape
KosmosPrime Sep 24, 2022
c5f8df3
Upgrade 3d-print AABB bounds to VoxelShape
KosmosPrime Sep 26, 2022
c396d37
Upgrade static AABB bounds to VoxelShape
KosmosPrime Sep 26, 2022
d7ee8ce
Turn cable shape into a BlockState property
KosmosPrime Sep 26, 2022
3a0b59d
Fix incorrect block state model multiplexing
KosmosPrime Sep 27, 2022
a105db8
Fix opening creative computer GUIs in survival
KosmosPrime Sep 29, 2022
ed519b1
Fix some blocks breaking instantly when mined
KosmosPrime Sep 30, 2022
c798008
Move item property definitions into Items class
KosmosPrime Oct 1, 2022
781907b
Remove the RobotAfterimage item representation
KosmosPrime Oct 1, 2022
f7a603d
Fix absent item stacking limits
KosmosPrime Oct 2, 2022
8641954
Fix different colored cables connecting visually
KosmosPrime Oct 2, 2022
122fe26
Fix incorrect drops in survival mode
KosmosPrime Oct 4, 2022
0a7311f
Remove creative tab facade from blocks
KosmosPrime Oct 5, 2022
6d1e73d
Move item and block rarities into Properties
KosmosPrime Oct 5, 2022
4733d61
Use scissor test to clip manual rendering
KosmosPrime Oct 5, 2022
33cbbfb
Fix mod events not running in a thread-safe way
KosmosPrime Oct 5, 2022
50d15b9
Convert recipes into a datapack
KosmosPrime Oct 9, 2022
4aaf219
Fix missing power distributor item
KosmosPrime Oct 9, 2022
5233848
Fix world load never completing with JEI present
KosmosPrime Oct 9, 2022
37311f2
Fix hard dependency on CC within Relay
KosmosPrime Oct 11, 2022
c5f64f5
Fix JEI tab order & rendering
KosmosPrime Oct 11, 2022
03fdc0f
Remove ItemBlacklist
KosmosPrime Oct 14, 2022
2f1182b
Reimplement loot disk cycling
KosmosPrime Oct 17, 2022
671461a
Reimplement (de)colorization recipes
KosmosPrime Oct 17, 2022
7d8e3e4
Fix decolorized items not stacking anymore
KosmosPrime Oct 18, 2022
4e31248
Fix hover boot rendering offset
KosmosPrime Oct 17, 2022
a10d8c7
Reimplement generic extended crafting recipes
KosmosPrime Oct 18, 2022
77c0583
Remove old dye color tag name system
KosmosPrime Oct 18, 2022
1ade67f
Fix hologram rendering
KosmosPrime Oct 19, 2022
6e6da2e
Fix missing block shapes breaking occlusion
KosmosPrime Oct 20, 2022
d39388b
Fix screen background rendering
KosmosPrime Oct 21, 2022
8a62c80
Fix loot disks not working on a real client
KosmosPrime Oct 23, 2022
ecbfeea
Fix loading of client-only code on servers
KosmosPrime Oct 24, 2022
2c1cc30
Fix access transformer not running outside of dev
KosmosPrime Oct 25, 2022
49a2bd1
Fix AE2 crash on load because of scala object
KosmosPrime Oct 26, 2022
6fab695
Fix WAILA crash due to bad ResourceLocation
KosmosPrime Oct 26, 2022
e45a5f4
Fix WAILA plugin not getting loaded
KosmosPrime Oct 26, 2022
9b80596
Fix getOwner call in EnderStorage driver
KosmosPrime Oct 26, 2022
b2d32e2
Fix stack overflow when connecting to CC devices
KosmosPrime Oct 28, 2022
47422ad
Fix RelayPeripheral wrapping results in a table
KosmosPrime Oct 28, 2022
980d0f4
Fix layout of forwarded modem_message event
KosmosPrime Oct 28, 2022
6b10e8d
Switch OC to Scorge (Scala 2.13.4)
KosmosPrime Oct 30, 2022
589235e
Fix serial provider getting registered too late
KosmosPrime Oct 30, 2022
82dfe4f
Switch to automatically built JNLua and LuaJ
KosmosPrime Nov 2, 2022
a4827be
Translate GLFW key codes to old LWJGL codes
KosmosPrime Nov 3, 2022
af1e965
Fix crash when render and init threads differ
KosmosPrime Nov 4, 2022
1ad8560
Fix crash when render and init threads differ
KosmosPrime Nov 4, 2022
6523d6a
Fix shortened parameter names in the API
KosmosPrime Nov 5, 2022
56d535a
Mark sounds as pre-loaded again
KosmosPrime Nov 5, 2022
4170fd1
Remove ModWaila as the plugin is annotation-based
KosmosPrime Nov 5, 2022
441a434
Use simpler ItemGroup constructor
KosmosPrime Nov 5, 2022
24b5214
Add an unobfuscated Jar task to simplify uploads
KosmosPrime Nov 6, 2022
73e9a26
Update jar version string format
KosmosPrime Nov 6, 2022
9cd631a
Mark CurseForge uploads as running on Forge
KosmosPrime Nov 6, 2022
6fd9ddc
add GitHub Actions
asiekierka Jun 7, 2022
2878acb
update GitHub Actions, add Modrinth uploads
asiekierka Nov 6, 2022
35ddfac
update GitHub Actions, save build JARs for builds
asiekierka Jun 7, 2022
c057e19
GitHub Actions: different artifact layout for 1.12 OC
asiekierka Jun 7, 2022
c71ccf3
fix github actions upload
asiekierka Aug 28, 2022
fa14967
fix modrinth upload
asiekierka Aug 28, 2022
9ea8df0
Implement missing LWJGL key code translations
KosmosPrime Nov 7, 2022
656b5ea
Add a run configuration for the server
KosmosPrime Nov 8, 2022
4246bf6
Fix NetSplitter toggle not updating cables
KosmosPrime Nov 8, 2022
4527a83
Correlate key and char events for computer input
KosmosPrime Nov 8, 2022
36358c3
Implement the proposed text_input event
KosmosPrime Nov 8, 2022
64e144f
Add missing default character translations
KosmosPrime Nov 9, 2022
abfd464
Merge pull request #1 from KosmosPrime/test-key-map
KosmosPrime Nov 9, 2022
f48a1e1
Remove temporary Lua changes
KosmosPrime Nov 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 36 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Java CI with Gradle

on: [push, pull_request, workflow_dispatch]

permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: ${{ runner.os }}-gradle-
- name: Build with Gradle
run: ./gradlew build
env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_KEY: ${{ secrets.GPR_KEY }}
- name: Archive artifacts
uses: actions/upload-artifact@v3
with:
name: OpenComputers
path: build/libs/*.jar
154 changes: 154 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
name: publish

on:
release:
types: [published]

jobs:
publish-github:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Extract Version from Tag
uses: rishabhgupta/split-by@v1
id: split_tag
with:
string: ${{ github.event.release.tag_name }}
split-by: '/'

- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: ubuntu-latest-gradle-
- name: Build with Gradle
run: ./gradlew -Pmod_version='${{ steps.split_tag.outputs._1 }}' build
env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_KEY: ${{ secrets.GPR_KEY }}

- name: Add Artifacts to Github Release
uses: alexellis/[email protected]
env:
GITHUB_TOKEN: ${{ github.token }}
with:
asset_paths: '["./build/libs/*.jar"]'

- name: Publish to Github Packages
run: ./gradlew -Pmod_version='${{ steps.split_tag.outputs._1 }}' publish
env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_KEY: ${{ secrets.GPR_KEY }}
GITHUB_MAVEN_URL: 'https://maven.pkg.github.com/${{ github.repository }}'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-curse:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Extract Version from Tag
uses: rishabhgupta/split-by@v1
id: split_tag
with:
string: ${{ github.event.release.tag_name }}
split-by: '/'

- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: ubuntu-latest-gradle-

# Set Curseforge release type based on pre-release flag.
- name: Set release type to 'release'
run: |
echo "CURSEFORGE_RELEASE_TYPE=release" >> $GITHUB_ENV
if: github.event.release.prerelease == false
- name: Set release type to 'alpha'
run: |
echo "CURSEFORGE_RELEASE_TYPE=alpha" >> $GITHUB_ENV
if: github.event.release.prerelease == true

- name: Publish to Curseforge
run: ./gradlew -Pmod_version='${{ steps.split_tag.outputs._1 }}' curseforge
env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_KEY: ${{ secrets.GPR_KEY }}
CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
CURSEFORGE_RELEASE_TYPE: ${{ env.CURSEFORGE_RELEASE_TYPE }}
CHANGELOG: ${{ github.event.release.body }}

publish-modrinth:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Extract Version from Tag
uses: rishabhgupta/split-by@v1
id: split_tag
with:
string: ${{ github.event.release.tag_name }}
split-by: '/'

- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@v1
- uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ubuntu-latest-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: ubuntu-latest-gradle-

# Set Modrinth release type based on pre-release flag.
- name: Set release type to 'release'
run: |
echo "MODRINTH_RELEASE_TYPE=release" >> $GITHUB_ENV
if: github.event.release.prerelease == false
- name: Set release type to 'alpha'
run: |
echo "MODRINTH_RELEASE_TYPE=alpha" >> $GITHUB_ENV
if: github.event.release.prerelease == true

- name: Publish to Modrinth
run: ./gradlew -Pmod_version='${{ steps.split_tag.outputs._1 }}' modrinth
env:
GPR_USER: ${{ secrets.GPR_USER }}
GPR_KEY: ${{ secrets.GPR_KEY }}
MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
MODRINTH_RELEASE_TYPE: ${{ env.MODRINTH_RELEASE_TYPE }}
CHANGELOG: ${{ github.event.release.body }}
Loading