Commit Graph

163 Commits

Author SHA1 Message Date
PepperCode1
c5e7ad623f Update Flywheel
- Fix too many implementations of ProcessingRecipe#canSpecifyDuration
returning true
2023-08-23 15:36:19 -07:00
PepperCode1
c052807773 Fix copycat model modifying potentially immutable list
- Perform minor mod initialization clean up
- Bump version to patch E
- Organize imports
2023-08-16 17:03:07 -07:00
PepperCode1
246543c76b Fix memory leaks
- Fix CopycatPanelModel using wrong state during trapdoor special case
- Update Flywheel
2023-07-03 13:53:51 -07:00
PepperCode1
a947a06263 Fix diving helmet check
- Update Flywheel
- Update buildscipt and Gradle
- Bump version
2023-06-30 14:12:48 -07:00
simibubi
5eea1cac70 Copycant
- Fixed Elevator Contraptions misaligning with their contacts after switching target floor mid-travel
- Fixed crash when placing a clipboard into replaceable blocks mid-air
- Fixed a typo in Smart Observer ponder scene
- Fixed funnel flaps being offset to the side when flywheel is disabled
- Fixed dyed valve handle using incorrect block particle textures
- Fixed copycat blocks able to take on invalid materials through the use of data commands
- Copycat blocks no longer retain nbt contents of their contained material's item when loaded from a schematic
- Fixed pipe connector attachments missing textures on some orientations
- Players can now sneak-pick to receive the copycat block itself, rather than its applied material
- Fixed value input screen not closing correctly when 'use' keybind is not on its default setting
- Deployers no longer fail to activate bearings and other components with value input slots
- Fixed an incompatibility between legacy copper pack and xycraft override
- Fixed netherite diving suit not protecting from fire damage when Quark is installed
- Attempt to fix lighting issues with elevator contacts
- Schematic and Quill no longer displays the full directory path in its confirmation message
- Fixed z-fighting on metal bars models
2023-05-23 21:26:59 +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
3f31353fea Start as Patch A 2023-05-13 01:58:14 +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
simibubi
a75e3af0b0 Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-02-24 22:10:33 +01:00
simibubi
40f96b0038 You wrenched this? I wrenched this.
- 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
2023-02-02 12:14:25 +01:00
simibubi
8cf282372c Tangled handlers
- Fixed server-side ticking code called from the render thread with forge 40.2.1 and up
2023-01-29 16:49:01 +01:00
simibubi
9ab3b77294 Repeat offender
- 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
2023-01-24 15:29:59 +01:00
simibubi
46c6856b6e Merge branch 'mc1.18/dev' into mc1.18/0.5.1 2023-01-16 13:43:51 +01:00
PepperCode1
6e6b8550b8 Balanced Blaze Burners
- Adjust how and when blaze burners accept fuel
- Fix crash with Optifine when rendering a map
- Fix RenderType being used in common code
- Increment version
2023-01-13 16:47:33 -08:00
PepperCode1
d8ec424fa0 Post-PR changes
- Rename ILangParial to LangPartial
- Simplify LangPartial and remove default LangMerger constructor
- Create CustomArmPoseItem and de-hardcode PotatoCannonItem and
ZapperItem
- Fix mixin order
- Update Flywheel
2022-12-11 15:23:15 -08:00
PepperCode1
5b038d419c Instanced steam engines
- Add SteamEngineInstance
- Delete contraption models on contraption invalidate
- Do not use enum subclasses in BottomlessFluidMode
- Fix ContraptionDriverInteractMixin being added twice
- Update Flywheel
2022-11-22 14:35:37 -08:00
PepperCode1
131c9a5479 Hard-working Registrate
- Deprecate CreateRegistrate#lazy, add CreateRegistrate#create, and call
registerEventListeners manually
- Remove Create#registrate and use Create.REGISTRATE instead
- Move tag datagen code and methods to TagGen
- Pass event busses directly to Curios#init
- Update logging to use SLF4J
- Update Flywheel to 0.6.8-95
- Increment version to 0.5.0.g
2022-11-17 13:50:15 -08:00
simibubi
945ecefe0d Bumpo 2022-10-19 00:37:05 +02:00
simibubi
d6ca0343b8 PR Datagen
- Hand cranks, valve handles and smart pipes can now be waterlogged
- Version bumped
2022-09-22 20:10:42 +02:00
simibubi
65073e84bd Patch D 2022-08-13 23:19:44 +02:00
simibubi
a1b949c084 Graddle me this
- Temporarily regress to FG 5.1.53
2022-08-13 18:13:20 +02:00
PepperCode1
82be76d893 JEI building, Gradle building
- Refactor JEI category building
- Fix placard item requirement not checking NBT
- Use AddPackFindersEvent instead of ShippedResourcePacks
- Remove unused config values
- Provide separate resource and data formats in pack.mcmeta
- Compress all images
- Update to latest Flywheel
- Disable jarJar inclusion of Flywheel
- Use ${file.jarVersion} instead of ${version}
- Add workaround for SpongePowered/MixinGradle#38
2022-07-16 01:58:43 -07:00
PepperCode1
4c45333687 JarJar Artifact Jar
- Use JarJar
  - Include Flywheel automatically
  - Include Registrate instead of shading it
- Refactor Maven coordinate scheme
  - Artifact ID: "Create" -> "create-{minecraft_version}"
  - Artifact Version: "{mod_version}.{patch}-{build_number}"
- Exclude datagen cache from built jars
- Include LICENSE file in build jars
- Sync mods.toml version with gradle.properties version
- Use more modern publication code
- Update Gradle: 7.4.1 -> 7.4.2
2022-07-14 15:02:24 -07:00
simibubi
1ec63c1511 Patch it while its hot
- Fixed Dedicated server crash when riding a train
- Fixed broken localisation component in super glue editor
- Fixed display links not showing correct icons for dyed nixie tubes
2022-07-12 17:51:25 +02:00
simibubi
370414846d bumb 2022-07-12 03:15:12 +02:00
Jozufozu
ef24999e31 Contraption's runway debut
- Contraptions support modeldata
 - Fixes issue where the wrong casing appeared on belts assembled to contraptions
 - Bump flywheel build
2022-07-11 14:37:26 -04:00
simibubi
3153ad2100 bug you a pardon?
- Arm Interaction point safety checks
- Trains no longer briefly derail when moving through portals
- Players are now less likely to get stuck in the original dimension when traversing train portals
- Trains no longer track coupling stress between carriages that are currently in different dimensions
- Fixed quark closing double doors when opened (+temporary workaround for 1.18)
- Boilers made of creative fluid tanks now provide a max level water supply
- Crafter ponder scene no longer uses an outdated recipe
- Reduced steam release effect of bogeys that haven't travelled far since the last stop
2022-07-11 19:28:25 +02:00
Jozufozu
f03bf9839c A pulley good day
- Fix crash when moving pulleys on a contraption
 - Bump forge and parchment versions
 - Bump flywheel version
2022-07-10 15:44:15 -04:00
PepperCode1
954f098cd1 Tiny goggles
- Fix goggles on smouldering blaze burner
- Shrink normal blaze goggles model
- Add new arm targets to ponder tag
- Update Registrate and Forge
2022-07-08 18:34:27 -07:00
Jozufozu
dc20f7091c Mopping up
- Fixes contraption world leak twofold.
 - Bump flywheel - 0.6.3.81
2022-06-22 13:44:34 -07:00
Jozufozu
3d8fdc69de A little back and forth
- Clean up the revert
2022-06-20 09:23:54 -07:00
Jozufozu
86dd1cd624 Revert "Material refactor pt 1"
This reverts commit 343c0fab
2022-06-20 09:17:51 -07:00
simibubi
841bf3f350 Merge branch 'mc1.18/dev' into mc1.18/global-railways 2022-05-22 18:10:40 +02:00
simibubi
329be0d948 Switch to forge RB 2022-05-22 17:34:18 +02:00
patryk3211
5a747ce93c Added support for wearing goggles on curios head slot 2022-05-10 14:51:38 +02:00
Jozufozu
343c0fab62 Material refactor pt 1
- PartialModels don't actually need reference states, use air instead
 - Bump flywheel build
2022-04-10 17:37:45 -07:00
Jozufozu
46ec1dd697 Looking things over
- Minor code cleanup
 - Bump flywheel build
2022-04-08 17:34:17 -07:00
simibubi
723e989ac5 Merge branch 'mc1.18/dev' into mc1.18/global-railways 2022-04-08 02:10:53 +02:00
Jozufozu
d7b63fd6f2 Spinning up the wheel
- Bump flywheel build - 0.6.2.65
2022-04-07 14:28:13 -07:00
PepperCode1
3c87044dc5 Super empty fluid
- Fix NPE with hose pulley
- Update Forge and Registrate
2022-03-30 17:44:16 -07:00
simibubi
273a276fda Version bump 2022-03-23 20:02:36 +01:00
simibubi
727b0a463e Damage Control
- Updated dependencies to 1.18.2
- Started work on compilation errors
2022-03-21 02:38:03 +01:00
simibubi
a8c368f426 Patch F
- Fixed Create's JEI plugin not reloading recipes properly
- Reverted an AT that seems to cause issues with compiling in IDEs
- Fixed Contraption disassembly causing inventory contents to be rolled back
- Fixed Crushing Wheels not working correctly
- Items idling on top of Crushing Wheels are no longer prevented from being picked up by players
- Fixed automated compatibility picking up custom recipes from the mod "occultism"
2022-03-21 00:29:45 +01:00
simibubi
0b17aab01e Patch E Prep 2022-03-12 20:31:12 +01:00
PepperCode1
2211632f5c Just enough brewing
- Optimize CreateJEI recipe list construction
- Optimize PotionMixingRecipes
- Add basic modded brewing recipe compatibility
- Fix dyed sails not being placed when printing schematics
- Fix sideways belts not being placed correctly when printing schematics
- Fix MechanicalCraftingCategory not applying the model matrix
- Add Upgrade Aquatic compatible fertilizer recipes; Resolve #658
- Replace almost all reflection with access transformers or accessor
mixins
- Remove duplicate sails tag
- Improve metal compatibility
- Switch to a linked set in StringSerializableTrigger to prevent
inconsistent generation of aesthetics.json
- Other minor changes
2022-03-12 00:04:05 -08:00
PepperCode1
fa4a0e7261 Limiting the infinite
- Add new config and tags for better control over infinite draining
behaviour
- Pipes spilling water will now extinguish entities and fires; pipes
spilling lava will now set entities on fire
- Fix some bugs and inconvenient behavior with the config menus
- Fix fluids destroying crushing wheel controllers
- Fix crushing wheel controller using output direction instead of input
direction at times
- Rename blaze burner fuel tags
- Improve GhostBlockRenderer
- Organize imports
- Update Forge
2022-03-05 01:45:39 -08:00
PepperCode1
0cf0d3930e Shuffling the shade
- Update Flywheel and add support for unshaded quads
- Fix models marking shafts and other parts as unshaded
- Refactor SchematicRenderer buffer building
- Improve block entity render bounding box caching
- Fix #2785
2022-02-19 21:42:40 -08:00
Jozufozu
984cde4d43 Move diffuse declaration to vertex compiler 2022-02-15 18:02:25 -08:00