commit a162e18c9c4d91c4020e86cf718d59d3a33b2817
Merge: 374848f97beb61708a
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Fri May 12 13:40:58 2023 +0200
Merge branch 'mc1.18/dev' into mc1.18/computercraft
commit 374848f978
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Fri May 12 13:22:29 2023 +0200
Compilation dependency toggle
commit b2cd60b619
Merge: 8e1e4e8bdee3a079ba
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Wed May 10 14:37:32 2023 +0200
Merge pull request #4650 from ChristianLW/mc1.18/computercraft
Small tweaks to the wiki pages for ComputerCraft integration
commit ee3a079bac
Author: Christian L.W <bebeu@bebeu.dk>
Date: Thu Apr 13 00:55:20 2023 +0200
Small tweaks to the wiki pages
commit 8e1e4e8bd3
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Mar 13 18:31:56 2023 -0700
Added computer to display source ponder tag
- Added advanced computer to display source ponder tag
- Added missing lang entry for computer display source
commit 952941e5fc
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Mar 13 16:31:16 2023 -0700
Added documentation for train station peripherals and train schedules
- Added in depth documentation for working with train stations and train schedules in Lua
- Fixed small formatting issues in Lua-Rotation-Speed-Controller.md and Lua-Sequenced-Gearshift.md
commit 7f3ca1cfa0
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Mar 13 16:29:05 2023 -0700
Added isTrainEnroute to station peripheral API
- isTrainEnroute checks if a train is currently navigating to the station
- Reworded null station exception to "station is not connected to a track"
- Refactored StationPeripheral#inAssemblyMode to StationPeripheral#isInAssemblyMode
- Added a check to StationPeripheral#disassemble to make sure the station isn't in assembly mode
commit fac1ebcd3f
Author: caelwarner <caelawarner@gmail.com>
Date: Sat Mar 11 16:12:58 2023 -0800
Added documentation for most peripherals
- Lua documentation has been added for all peripherals except the train station (not looking forward to writing that one)
- This documentation will be added to the GitHub wiki pages
commit 3e21996984
Author: caelwarner <caelawarner@gmail.com>
Date: Sat Mar 11 15:54:36 2023 -0800
Updated DisplayLinkPeripheral#write to move cursor to the end of the text
- This change was made to be more inline with ComputerCraft's builtin display API
commit 7141c10025
Author: caelwarner <caelawarner@gmail.com>
Date: Sat Mar 11 11:45:43 2023 -0800
Added isTrainImminent and hasSchedule to train station API
- Added isTrainImminent to check if a train is incoming to the station and hasSchedule to check if the currently present train has a schedule
- Added StationPeripheral#getTrainOrThrow to consolidate repetitive null checks
commit 909484ed5b
Author: caelwarner <caelawarner@gmail.com>
Date: Sat Mar 11 11:15:58 2023 -0800
Added getSchedule to train station lua API
- Added getSchedule which serializes the currently present train's schedule into a lua table
- Refactored StationPeripheral#setSchedule to use a more generic method of serializing NBT tags to lua tables
- Moved schedule entry special data from root tag to "Data"
- Added StringHelper#camelCaseToSnakeCase
- Added variety of put methods to CreateLuaTable
commit 31ad3aa671
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Mar 8 18:22:23 2023 -0800
Extended train station peripheral API
- Train station peripherals can now assemble and disassemble trains, check if the station is in assembly mode, set the assembly mode of the station, get and change the station name, check if a train is present at the station and get and change the currently present train name.
- Refactored StationEditPacket. Moved most of the logic that was previously in StationEditPacket to StationTileEntity. This allows us to call this logic without having to send a packet.
- Made Train#owner nullable. This is needed so that computers can assemble trains. All Train#owner is currently used for is to display the train status to the correct play.
commit 574cd93a89
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Nov 30 00:37:47 2022 -0800
Serialize hasAttachedComputer in ComputerBehaviour
- This eliminates some edge cases were peripherals don't realize they're being controlled by a computer on a world save and load
commit 94e3ed44ad
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Oct 26 16:57:12 2022 -0700
Added ComputerScreen
- ComputerScreen shows that tile entity currently has computers attached and therefore cannot be controlled manually
commit 9afdcaded7
Author: caelwarner <caelawarner@gmail.com>
Date: Thu Oct 20 10:18:37 2022 -0700
Refactored PeripheralBase to SyncedPeripheral
commit 7d47fdcd06
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Oct 19 22:45:47 2022 -0700
Made LuaFunction's final
commit 56a1210fff
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Oct 19 22:39:38 2022 -0700
Created ComputerBehaviour behaviour
- ComputerBehaviour replaces ComputerControllable and SyncedComputerControllable
commit 19d283b923
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Oct 19 16:05:48 2022 -0700
Moved all peripheral classes to computercraft.peripherals package
commit ab18034b98
Author: caelwarner <caelawarner@gmail.com>
Date: Wed Oct 19 15:58:56 2022 -0700
Added Train Station as peripheral
- Train station can set a new auto-schedule for the train currently at the station
- Added CreateLuaTable to add helper functions for working with lua tables
- Added StringHelper util class to convert snake case to camel case
commit 1091f3227c
Author: caelwarner <caelawarner@gmail.com>
Date: Thu Oct 6 21:11:24 2022 -0700
Changed Display Link Peripheral API
- Changed the Display Link Peripheral API to be more in line with the Monitor API
- Added write, setCursorPos, getCursorPos, getSize, isColor, isColour, clearLine
- Removed void writeLine, setLine, writeLines, setLines
commit 18bfb216b1
Author: caelwarner <caelawarner@gmail.com>
Date: Thu Oct 6 02:50:41 2022 -0700
Changed method of checking if a computer attached
- After talking with SquidDev from CC: Tweaked I've changed to monitoring IPeripheral#attach and IPeripheral#detach for changes in the number of computers connected to the network, then updating the client using AttachedComputerPacket
- This works with wired full modems, wired cabled modems and directly connected computers
- Added SyncedPeripheralBase and SyncedComputerControllable for TE's and peripherals that want to be aware of attached computers
commit 96dc4db6dc
Author: caelwarner <caelawarner@gmail.com>
Date: Tue Oct 4 21:11:38 2022 -0700
Sequenced Gearshift screen "greys out" when being controlled by a computer
- This is to stop players from trying to using both the builtin sequencing and a computer to control the Sequenced Gearshift at the same time, leading to undefined behaviour
- The "greyed out" screen should have a message added explaining why it's greyed out.
- Added ComputerControllable#isComputerControlled to check if a tile entity is connected to a modem
commit 9a80781401
Author: caelwarner <caelawarner@gmail.com>
Date: Tue Oct 4 19:36:08 2022 -0700
Added PeripheralBase
commit d404f07319
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Oct 3 20:46:16 2022 -0700
Added invalidateCaps
- Changed setRemoved to invalidateCaps. I don't know why I wasn't just using invalidateCaps from the beginning
commit 654476d9f3
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Oct 3 20:05:25 2022 -0700
Added Rotation Speed Controller and Sequenced Gearshift as peripherals
- Rotation Speed Controller can get and set targetSpeed
- Sequenced Gearshift can rotate by a certain angle and move a certain distance
commit 1420406ab7
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Oct 3 16:38:12 2022 -0700
Added Speedometer and Stressometer as peripherals
- Speedometer can get current speed
- Stressometer can get current stress level as well as network stress capacity
- Made GaugeTileEntity abstract
commit 47b8619d07
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Oct 3 16:17:05 2022 -0700
Refactored peripheralHandler to peripheral
- peripheralHandler was the wrong name. It's just a peripheral.
- Changed peripheral type from "cdl" to "Create_DisplayLink"
- Added equals function to DisplayLinkPeripheral
commit 6591c2d46e
Author: caelwarner <caelawarner@gmail.com>
Date: Mon Oct 3 14:29:04 2022 -0700
ComputerCraft integration for Display Links
- CC computers can now control display links through a variety of functions
- Added ComputerControllable interface to define a tile entity as controllable by CC computers
- Added CC: Tweaked soft dependency
- Outline buffering now uses Vector3f instead of Vec3 to avoid creating
many objects and double to float casts
- Remove OutlineParams.transformNormals since it was not used
- Rename OutlineParams#disableNormals to disableLineNormals since only
lines have normals disabled
- Fix seats not having descriptions
- Players can now sneak while using exp nuggets to only consume one item at a time
- Fixed brass funnels losing their filter when changing from or to a belt/depot funnel
- Minecart contraption items can no longer be placed in container items like toolboxes or shulkers (configurable)
- Implement #4436, #4419
- Fix some contraption transforms (fixFabricators-of-Create/Create#591)
- Remove AllStitchedTextures
- Organize imports
- Swap jarjar versions and ranges to ensure more reliable version
matching
- Add the jarJarRelease task to the jarjar group
* Fix regex in issue labeler config
The regex was wrongly matching extra characters through the use of `.` which matches any character. This also adds the requirement of the match version number being immediately after the `Minecraft Version` section.
* update issue-labeler to v3
* Update labels.yml
* fix backslashes again
* fix that there are actually two newlines
* fix escaping again?
* use sync labels
* use single quotes
* use more double backslashes
* reduce to test if this works at all
* reintroduce minecraft version
* doesn't work
* try previous version
* didn't help
* add back the 1.
* Make Encasing utilize Interfaces
* Add Javadoc to IEncasable and IEncased interfaces
* Fix Weird block.block issues (No clue where those came from)
* Final Touch ups for now and made requirement for casing normal Block instead of CasingBlock
* Make requested changes
* Add more parameters for tryEncasing, for use in handleEncasing
Move handleEncasing to Encased Interface for more flexability
* Simplify and organize
- Rename:
- Encasable -> EncasableBlock
- Encased -> EncasedBlock
- EncasableRegistry -> EncasingRegistry
- Remove EncasedBlock#setCasing
- Remove encasedBlock argument from EncasedBlock#handleEncasing
- Add Registrate builder transformer to EncasingRegistry for easy use
---------
Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
Can't test it due to java shenanigans, but I think this will work.
It's worth noting that this will only be specific to merging as long as transferAll is. If anything else ends up using transferAll, all that needs to happen is adding an intermediate method that posts the event instead of transferAll doing it, then calls transferAll
- Fix NPE in CarriageSyncData (Unknown cause)
- Fixed crash when applying text to display boards before they initialise
- Fixed incorrect itemstack remainders on Weighted Ejectors
- Other mods' wrenches now always behave like the Create wrench on IWrenchables
- Crashes that occur during schematic loading no longer terminate the server
- Fixed crash when creating new belts at existing chutes/funnels
- Fixed ghost items appearing on non-powered belts when extracted from
API v1 has been deprecated for over a year now and should no longer be used. There are two options for implementation of this fix:
- Use the dedicated shields.io route
- Update it to still manually construct the request with API v2
Each has advantages and disadvantages. Namely, the former no longer has the precise count, and the latter will need manual reconstruction every time that the API updates. Considering that this is down to the clock with how many deprecation warnings have gone out at this point, I believe the former is the best option, and thus the one I have implemented in this PR. If you believe the latter is better, feel free to request that change.
