Commit graph

328 commits

Author SHA1 Message Date
IThundxr
e3b5732539
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	gradle.properties
#	src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
#	src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionPacket.java
#	src/main/java/com/simibubi/create/content/logistics/packager/PackageDefragmenter.java
2025-01-25 15:16:54 -05:00
IThundxr
80dcbb4177
Regex globs
- Parse Schedule Destination, Fetch Packages package addresses with glob
- Also prevent regex injection in all 3 of the above
2025-01-25 15:07:45 -05:00
IThundxr
b4cf29ec83
Missing files
- Fix mechanical piston head and piston extension pole loot tables being missing
- Run datagen
2025-01-24 19:17:55 -05:00
IThundxr
91766abf62
Evening fixes 2025-01-22 17:28:32 -05:00
simibubi
474b254dfe Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-22 12:40:47 +01:00
simibubi
547709c2e0 The last arrow bender
- Factory gauges try to default to an arrow direction that doesn't clip into blocks
2025-01-21 17:17:04 +01:00
simibubi
70933fead0 Operation: Save the saves
- Reading block positions from nbt is now backwards compatible with 1.20
2025-01-21 14:59:05 +01:00
Jozufozu
153c63f1c8 Package deal
- Add package entity visual
- Add packager visual
  - Don't render the box model in the visual because it relies on item
    transforms
- Bump flywheel build
- Upgrade to some of the newer Affine functions where applicable
2025-01-20 12:40:31 -06:00
IThundxr
e4b1f80ff3
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	build.gradle
#	gradle.properties
2025-01-19 19:20:58 -05:00
IThundxr
312ae4f674
Lost packets
- Fix packets not being registered on the server
2025-01-18 23:29:37 -05:00
IThundxr
528bf0aaeb
The cat is out of the box 2025-01-18 20:56:03 -05:00
IThundxr
c845431cad
Regressions
- Fix regressions from the catnip & ponder merge
2025-01-18 16:30:51 -05:00
IThundxr
e261439c63
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-18 13:07:17 -05:00
zelophed
071c3969f5 merge mc1.20.1/feature-dev & bump ponder version 2025-01-18 15:21:02 +01:00
zelophed
2141e69aa2 Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.20.1/merge-catnip
# Conflicts:
#	build.gradle
#	src/main/java/com/simibubi/create/AllPartialModels.java
#	src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/fan/processing/AllFanProcessingTypes.java
#	src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java
#	src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java
#	src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelModel.java
2025-01-18 15:04:48 +01:00
IThundxr
9edc952d3a
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-17 22:16:44 -05:00
zelophed
3fb6e71ec8 remove references to catnip as a mod 2025-01-17 14:52:52 +01:00
Jozufozu
efedee7d48 Confused diffuse
- Fix bottom of chain conveyor guards not matching the bottom of chain
  conveyors
- Bump flywheel build, add vanillin at runtime
2025-01-16 12:18:45 -08:00
IThundxr
9be39b7f3b
Moving On II 2025-01-16 12:28:44 -05:00
IThundxr
3f3f5a3c24
Eclipsed moon again
- Disable config cache, doesn't support eclipse yet
2025-01-12 16:44:32 -05:00
IThundxr
88907795fe
Elephant taming
- Enable parallel and caching args
- Modify tasks to support configuration cache
2025-01-12 16:23:40 -05:00
IThundxr
a962ade027
A new era
- Switch to MDG instead of using FG
- Implement CI-based mod publishing
- Embed commit hash into the built jar
- Log commit hash
2025-01-12 16:06:44 -05:00
IThundxr
7e0d504897
A forgotten language
- Fix lang keys for keybinds
2025-01-12 12:18:09 -05:00
IThundxr
e91a85c19b
Evening Debug Session
- Fix tunnels causing a stack overflow
- Fix crushing wheel gametest
- Fix frog seat position
- Update track placement codec
2025-01-10 21:46:47 -05:00
IThundxr
2ed67bf116
Optional but important decisions
- Update catnip
- Fix compile errors caused by updating catnip
- Fix a few crashes
2025-01-09 21:29:50 -05:00
IThundxr
6c35eb18cb
Bugs in the tests
- Fix bugs in gametests
- Fix misc crashes
- Fix screens having title screen blur
- Fix gametest export command
2025-01-09 19:45:25 -05:00
IThundxr
a87689b9e4
The elephant stares back
Add some flags to hopefully speed up building/syncing
2025-01-09 17:52:57 -05:00
IThundxr
43f33c4345
The packets and the bees
- Fix some packets
- Remove unused import in multiple packets
- Fix improper data reading
2025-01-09 17:52:56 -05:00
IThundxr
46c0b090fb
Cat++
- Update catnip to fix SbbBuilder
2025-01-08 19:17:15 -05:00
IThundxr
15565fab47
Port to 1.21.1
Co-authored-by: TropheusJ <jverrellijr@icloud.com>
Co-authored-by: techno-sam <77073745+techno-sam@users.noreply.github.com>
Co-authored-by: ryanhcode <42245712+ryanhcode@users.noreply.github.com>
2025-01-07 21:00:32 -05:00
IThundxr
2e7486070e
Flywheel += 2
- Update flywheel
2025-01-07 17:24:34 -05:00
IThundxr
1506570f34
Pondering some catnip
- Update catnip
- Update ponder
2025-01-07 17:21:55 -05:00
simibubi
c4b38ba32f Needs more sunscreen
- Fixed uv issues on the fluid tank
- Tweaked frogport sounds
2025-01-06 22:57:29 +01:00
IThundxr
f405d2bba1
Invisifluids
- Fix gasses not being visible in basins, item drains etc
- Fixes Creators-of-Create/Create#7236
2025-01-05 11:07:48 -05:00
Jozufozu
8036d5cdc3 The wheel churns
- Bump flywheel and catnip builds
- Fix compile errors caused by upstream refactors
- Unintentionally fixes some lighting issues when the forge pipeline is
  enabled
2024-12-24 23:01:46 -08:00
IThundxr
d1c598b388
Fancy abstractions
- Switch to loader agnostic methods provided by catnip
2024-12-16 09:35:42 -05:00
simibubi
9b042e51e5 Bug hunt II
- Update catnip (Fixes doubled models in ponder)
- Add burn time for cardboard blocks
- Remove train colour scroll input when no map mods are present
- Fixed desyncs when picking up packages at the player reach limit
- Fixed stock keeper search results not comparing names in lowercase
- Fixed packages leaving encased chutes 'dying' through suffocation
- Fixed categories not collapsing on click when invalid filters are present
2024-12-12 22:28:13 +01:00
IThundxr
eec0dc1de3
Fix potion fluids being rendered with no color 2024-12-06 17:44:00 -05:00
simibubi
311c88b1a2 Update catnip 2024-12-06 12:34:49 +01:00
IThundxr
081fa6f4ae
Update catnip 2024-12-05 17:13:44 -05:00
Jozufozu
b2ddec57ef Thinking with portals
- Fix contraption visuals not actually being invalidated, motivated by
  getting carriage contraption visuals to go through portals correctly
- Fix bogey visuals initially appearing with incorrect transforms
- Fix contraption visuals initially appearing lerp'd between the origin
  and their actual pos
- Use max of mesh/instance light in instance shaders
- Bump flywheel version to fix contraption self lighting
2024-12-02 18:26:49 -08:00
IThundxr
d92b47d0ef
Box in the vents
- Make the player hitbox smaller when hiding as a box and allow them to go into 1x1 spaces
2024-11-24 11:46:20 -05:00
Jozufozu
b703de3b78 Whisked away
- Remove BeltInstance
- Belt visuals now use ScrollInstance
- Improve ScrollInstance setters to work well with belts
- Simultaneously simplify belt visual and make it more complicated
  - Deduplicate setup code
  - Inline speed calculation and all random constants that were stored
    in the visual. Those are cheap enough that we can just re-calculate
    as necessary to save on the memory cost
  - Move magic constants to statics
  - Make instances final
2024-11-17 14:08:50 -08:00
Jozufozu
6155883de0 Know your place!
- Using new debug tool, fix all visuals that initialize their instances
  at the render origin
- Update ArmVisual and SteamEngineVisual to use instance hiding
- Update SchematicannonVisual, SteamEngineVisual, and ToolBoxVisual to
  avoid re-calculating animations when nothing is happening
- Use RecyclingPoseStacks in ArmVisual and CarriageContraptionVisual
- Bump flywheel version
2024-11-16 16:14:02 -08:00
Jozufozu
a7a85c7296 Elevating the look
- Implement ElevatorPulleyVisual
- Makes good use of recycling and instance hiding
- Fixes issue where the elevator belt cannot be seen at the bottom of
  very tall elevators
- Add offset field to scroll instance to support the elevator belt's CPU
  driven animation
- Use shader light for the elevator belt to simplify tracking. Might be
  better off copying what the other pulleys do, but this achieves the
  effect quite well.
- Bump flywheel version
2024-11-15 13:12:27 -08:00
Jozufozu
3b7b5a9eee Burying the lighting bugs
- This may not be worth it, but it definitely looks better
- Switch to flat shader lighting for curved track segments
- Fixes dark track segments when clipped into hills
- Bump flywheel version
2024-11-12 20:11:23 -08:00
Jozufozu
e201ce7321 What is your name?
- Fix frogport nametags not rendering with flywheel on
- Bump flywheel version
2024-11-11 15:34:23 -08:00
Jozufozu
71a0a6e28f Twofold bump
- Bump flywheel version to fix visual issues and crashes
2024-11-08 10:25:23 -08:00
simibubi
bdd51e349e You must play for this
- Fixed stock ticker returning payments client side
- Fixed package sneak right click voiding items
- Fixed factory gauge not using an item when added to a block space
- Halved cost of conveyor chain connections, added a chain recipe using zinc
- Made stock keeper screen more resistant to issues with low tps and latency
- Item hatch deposits held item before inventory
- Fixed funnels not able to extract when any entity is nearby, even glue
- Cardboard box no longer renders in first person mode
- Fixed stock keeper not telling item durability
- Pulp recipe is now more generous
- Fixed server startup issue with new bogey registration
- Fully emptied stacks in stock keeper view will show as empty slots
2024-11-08 16:20:34 +01:00
simibubi
b1b5e192a1 Merge branch 'mc1.20.1/high-logistics' into mc1.20.1/feature-dev 2024-11-06 09:32:22 +01:00