Commit graph

3804 commits

Author SHA1 Message Date
PepperCode1
47f18aa1f9 Just a little repackaging 2023-05-21 11:58:31 -07:00
simibubi
3698b4473a Quick bucks
- Fixed a merge error causing container items to be added to basin outputs twice
2023-05-21 10:35:11 +02:00
simibubi
9c41acfb2a Backport of the century
- Flywheel is now included (jij) in Create jars on 1.18.2
2023-05-20 22:14:06 +02:00
PepperCode1
eaf71102a7 Update JEI Maven and FG 2023-05-20 08:37:56 -07:00
simibubi
eeeb2f4509 Implement #4770 2023-05-17 12:47:55 +02:00
simibubi
852996cea9 Make it brighter 2023-05-17 12:44:02 +02:00
simibubi
3bd2080f61 Compact Course
- Added the Block of Experience
2023-05-16 22:27:43 +02:00
simibubi
0ce0c6939a Crush all Modpacks
- Renamed crushed ore items to 'crushed_raw_x'
2023-05-16 16:47:47 +02:00
PepperCode1
1b76b147b1 1.19 is enchanting
- Remove EnchantmentHelperMixin and use 1.19 enchantment extensions
instead
- Bump minimum Forge requirement to 43.2.3
2023-05-16 07:12:08 -07:00
simibubi
d57fb72411 git pls 2023-05-16 15:42:23 +02:00
simibubi
41c73c2c2c Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-16 15:32:21 +02:00
PepperCode1
bb5d0fedee Mixin scrubbing
- Move all client mixins to separate package
- Prefix all mixin injector callback methods and added fields
- Remove unnecessary code from EntityContraptionInteractionMixin
- Remove EnchantmentMixin and use IForgeItem#canApplyAtEnchantingTable
instead
- Do not sync fire immune tag to client
- Bump network version to 3
- Remove 0.5.0j from Github issue template
2023-05-16 06:08:10 -07:00
simibubi
9c0c058fc0 SeamsBad
- Pushed surfaces around by fractions of a pixel to cover up misaligned geometry from mc's model rendering
2023-05-15 01:12:38 +02:00
simibubi
5eb100d0f3 Merge fixup 2023-05-14 00:33:25 +02:00
simibubi
03feeb71ef Stop funnelling around
- Fixed filters with an unset (*) extraction amount not migrating correctly from 0.5 worlds
- Move more recent version of palettes reference to `assets\create\reference`
2023-05-14 00:23:46 +02:00
PepperCode1
3d3ef68900 Improve LerpedFloat#settled() 2023-05-13 07:57:06 -07:00
simibubi
c1c69f1bb9 Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-13 15:18:21 +02:00
simibubi
49166f8dab Fixed Bogey registry loading flywheel classes 2023-05-13 15:16:51 +02:00
simibubi
150fc44d04 Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-13 13:19:14 +02:00
simibubi
e83fd736da Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-05-13 13:01:28 +02:00
simibubi
621f9991af
Merge pull request #4757 from Creators-of-Create/l10n_crowdin_translations
New Crowdin translations
2023-05-13 12:55:51 +02:00
Crowdin Bot
dc5210909c New Crowdin translations by Github Action 2023-05-13 10:54:12 +00:00
simibubi
2b02e56052 Captains log 2023-05-13 12:37:52 +02:00
simibubi
3f31353fea Start as Patch A 2023-05-13 01:58:14 +02:00
simibubi
5a18b86309
Update gametest.yml 2023-05-13 01:28:50 +02:00
Kryppers
1273712ba0 door to door
tweaks to the train door textures
2023-05-12 22:53:00 +01:00
simibubi
a11261fc36 Datagen 2023-05-12 23:17:30 +02:00
simibubi
c28b755ec1 Merge branch 'mc1.19/dev' into mc1.19/0.5.1 2023-05-12 23:17:22 +02:00
simibubi
f8324f135e Fixed OBJ logspam 2023-05-12 23:12:07 +02:00
simibubi
b6003ea6a4 Port new Changes 2023-05-12 23:04:13 +02:00
simibubi
500019465a Merge remote-tracking branch 'origin/mc1.18/0.5.1' into mc1.19/0.5.1 2023-05-12 22:59:18 +02:00
simibubi
56b35484d6 Netherite armor tags 2023-05-12 22:33:39 +02:00
simibubi
f616220b2c Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-05-12 22:04:34 +02:00
simibubi
d5367747ef
Merge pull request #4750 from Attack8/mc1.18/dev
Add armor tags for Create armors
2023-05-12 21:56:16 +02:00
simibubi
5fc755eb16 Merge branch 'mc1.18/0.5.1' of https://github.com/Creators-of-Create/Create-Concealed into mc1.18/0.5.1 2023-05-12 21:51:37 +02:00
PepperCode1
0fa0bbaf5d Unswap parameters to make sense 2023-05-12 11:00:54 -07:00
PepperCode1
aa102dfabd Filtering for filters
- Allow filtering for filters when filter is empty
- Refine waterwheel model generation code
2023-05-12 10:55:03 -07:00
simibubi
d4152728e6 Fivepointone-ify Again 2023-05-12 15:14:08 +02:00
simibubi
ab221b9d5b Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-05-12 15:13:45 +02:00
simibubi
3ad4195dd6 Squashed commit of the following:
commit a162e18c9c4d91c4020e86cf718d59d3a33b2817
Merge: 374848f97 beb61708a
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: 8e1e4e8bd ee3a079ba
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
2023-05-12 13:41:28 +02:00
NerdsOfAFeather
db19a394f5 Add armor tags for Create armors 2023-05-11 20:34:48 -04:00
TropheusJ
beb61708a0
Add GameTests by TropheusJ (#4496) 2023-05-11 15:00:32 +02:00
simibubi
8e03372bb3 Hacking the printer
- Fixed Smart Fluid Pipe not dropping filter when broken
- Fixed Clipboard crashing game when removing the first entry of a page
- Placards and Creative Crates will no longer hold on to special nbt content (except potion data, damage, enchants) of the contained item when imported via Schematicannon
- Schematicannons can no longer print mobs
- Fixed item frames not requiring an exact nbt match for printed contents
2023-05-11 14:15:56 +02:00
simibubi
f8ec8e5ded Fixed #4744 2023-05-10 21:36:18 +02:00
simibubi
b3d829b60f
Merge pull request #4678 from Matt5981/mc1.19/dev
Add checks on contraption disassembly for Sculk Sensors/Shriekers.
2023-05-10 18:39:47 +02:00
simibubi
3675caebfd
Merge pull request #4630 from Kanzaji/Mangrowe_Byg_Compat_Patch
Remove Mangrove Wood from BYG Compat to stop generating invalid recipes
2023-05-10 18:39:02 +02:00
simibubi
3c1961c846 Implement #3906
- Fixed players dismounting from Trains upon assembly
2023-05-10 16:53:29 +02:00
simibubi
ee33858ddc Move event invocation in case transferAll gets re-used 2023-05-10 16:09:03 +02:00
simibubi
c86c10f1b1
Merge pull request #4443 from DaComputerNerd717/mc1.18/dev
Add TrackGraph merge event to API
2023-05-10 16:01:35 +02:00
simibubi
b4a8386cd8 Implement #4534 as configurable multipliers 2023-05-10 15:31:28 +02:00