mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-15 00:37:09 +01:00
Code Issues Projects Releases Packages Wiki Activity
3933 commits 31 branches 14 tags 109 MiB
Commit graph

243 commits

Author SHA1 Message Date
Jozufozu
aa15182005 Merge remote-tracking branch 'origin/mc1.20.1/dev' into mc1.20.1/dev 2024-09-03 12:45:18 -05:00
Jozufozu
14c93e590c Merge branch 'mc1.20.1/flywheel-upgrade' into mc1.20.1/dev 
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java
#	src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmRenderer.java
#	src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelRenderer.java
#	src/main/java/com/simibubi/create/content/trains/schedule/hat/TrainHatArmorLayer.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/create.mixins.json
 2024-09-03 12:44:26 -05:00
simibubi
ad3778e0c4 Moving on 2024-09-03 18:37:56 +02:00
simibubi
e3331d363d Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-09-03 15:44:12 +02:00
simibubi
2e6d114cfd Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-03 15:42:39 +02:00
simibubi
11787d845f Update jij version range, Patch H 2024-09-03 15:39:36 +02:00
simibubi
3fddf2f99a Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-09-02 22:30:45 +02:00
simibubi
b1ceb102f8 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-02 22:00:32 +02:00
simibubi
9ce6f6f73f Fly++ 2024-09-02 21:44:24 +02:00
simibubi
59a3ab244b Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-25 20:29:49 +02:00
simibubi
0f0e00c781 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-25 19:51:28 +02:00
simibubi
e40b844aa1 Ground-breaking Excavation 
- Update and scale icons
- Fixed Display Boards updating instantly only at 256rpm Clockwise, not CCW
- Fixed Pulley ropes able to break unbreakable blocks
- Fixed encasing belts not playing a place sound
 2024-08-25 12:47:09 +02:00
simibubi
44a2181bb1 E A Ports. It's in the blame 
- Port new changes to 1.20.1
 2024-08-07 16:42:42 +02:00
simibubi
49030ec91f Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-07 15:39:06 +02:00
simibubi
42b57bdd61 Update framed blocks integration 2024-08-07 10:39:18 +02:00
simibubi
a012194f0f Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-07 09:07:28 +02:00
simibubi
a37acd5b18 5.1G Standards 2024-08-07 08:28:08 +02:00
simibubi
c66827c43e The Frame Train 
- Fixed modded signs getting wiped when moved by contraption or printed in a schematic
- Added schematic compatibility for the mod "framed blocks"
 2024-08-06 18:50:20 +02:00
Jozufozu
eae8cd467b Cranking out fixes 
- Fix hand crank not deleting its rotatingModel
- Fix exception setting up pulley lightcache
- Bump flywheel build to fix garbage models
 2024-07-27 18:30:40 -07:00
Jozufozu
5be92fcde8 Bumpy road 
- Bump flywheel build
- Directly rotate the last pose and normal matrix in SBB
 2024-07-27 17:43:24 -07:00
simibubi
b90e11c120 Squashed commit of the following: 
commit e398793b887986e730cf6b3c7a9c96861d186591
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 25 11:00:21 2024 +0200

    Remove duplicate line in buildscript

commit e6a1ebd40332ba649fab968841d7b88cdec51553
Merge: acbe5102c 283998711
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 25 10:48:13 2024 +0200

    Merge branch 'mc1.18/dev' into pr/6403

commit acbe5102cf4757f75adeb21ebff8b0649e74e2a5
Merge: 4d2c35b11 1038b76d3
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date:   Thu Jul 18 10:27:51 2024 +0200

    Merge branch 'mc1.18/dev' into pr/6403

commit 4d2c35b11b
Author: attackeight <attackeight@gmail.com>
Date:   Tue Apr 23 15:39:37 2024 -0400

    Re-Activate Dynamic Trees Compat
 2024-07-25 11:00:57 +02:00
IThundxr
73661845fe fix instances & update flywheel 2024-07-19 21:42:18 -07:00
IThundxr
05c2cbaf73 Flying the wheel away 2024-07-19 21:42:18 -07:00
Jozufozu
ec0350cfba Revving up 
- Bump flywheel build
- Bulk replace com.jozufozu -> dev.engine_room
- Optimize imports
 2024-05-25 12:25:19 -07:00
Jozufozu
0d324ffdf9 Simply implless 
- Use split api/runtime flywheel jars
- Update instance types to use single packed light int
- Update visuals to use new context location
 2024-05-20 21:31:55 -07:00
Jozufozu
d28fd7e47b Touchups 
- Bump flywheel version and remove #shouldReset
- Water wheels and belt tunnels now properly handle updates without
  resetting
- Fix flaps going crazy
 2024-04-02 19:23:14 -07:00
Jozufozu
26074dc3df Cut it out 
- Remove CutoutPartial
- Set render_type in models than need cutout
- Fix TrackVisual going invisible when renderers reload
- Fix TrackVisual not getting re-lit in some cases
- Bump flywheel version
 2024-04-02 19:23:14 -07:00
Jozufozu
a38f01fae2 Relit 
- Actually use light volume api stuffs
- Bit of a pain to try to iterate over sections based on an AABB
- Still need to handle when contraptions move
- Bump flywheel version
 2024-04-02 19:23:14 -07:00
PepperCode1
605daed671 Update Flywheel 
- Fix SBB model buffering passing empty instead of virtual model data,
resulting in blocks like shafts appearing invisible with Flywheel off
- Fix endAndCombine not null checking unshadedData before transferring
it
- Remove VirtualEmptyBlockGetter which already exists in Flywheel
 2024-04-02 19:23:14 -07:00
Jozufozu
7613ebcb1e Embed and virtualize 
- Use VisualEmbedding in ContraptionVisual
- Remove context shaders
- Directly use the model from the blockstate in VirtualRenderHelper
  - Fixes many bes trying to use empty meshes because they correctly
    identify as ENTITYBLOCK_ANIMATED
- Fix valves being unlit
- Fix bearing contraptions spinning way too fast
- Do not implement SimpleDynamicVisual in CarriageContraptionVisual,
  that's taken care of by the base ContraptionVisual now
 2024-04-02 19:23:13 -07:00
Jozufozu
286d2a68ab As shrimple as that 
- Update to SimpleDynamicVisuals
- Translate old context stuff to new api
- Add contraption visual, doesn't fully work yet
- Strip out more FlwContraption stuff
 2024-04-02 19:23:13 -07:00
Jozufozu
633a7abc23 Exit stage right 
- Update to implicit render stage API.
- Fix bounding sphere transformers.
- Bump flywheel version.
- Update flywheel mixin config jsons.
 2024-04-02 19:23:13 -07:00
Jozufozu
5038d04ac4 Pretty rad 
- Bump flywheel build.
- Fix all(?) places where radians methods were passed degrees
- Add DiffuseLightCalculator.
- Add overlay to belt and rotating types.
- Use joml quaternions in instance types.
 2024-04-02 19:23:13 -07:00
Jozufozu
b6d1f02d6a Chugging along 
- Fix compile errors with new flywheel light update system.
- Fix compile errors in instance shaders.
- Call Instance#setChanged where needed.
 2024-04-02 19:23:13 -07:00
Jozufozu
5bac9e5224 Things on the screen again 
- Use our own model cache that's aware of virtual data.
- Fix memory write issues with instance types.
- Indirect works too, though the cull shaders are still incorrect.
 2024-04-02 19:23:13 -07:00
Jozufozu
e892003eb5 Throwing shade 
- Actually register instance types.
- Update instance shaders to compile with new flywheel.
- Add cull shaders.
- Update flywheel dep in mods.toml.
- Bump flywheel build.
 2024-04-02 19:23:13 -07:00
Jozufozu
8d54e9268a Top 50 errors of all time 
- Down to 50 compile errors.
- Port over to new instance type builders.
- Move shaders and delete program specs.
- Switch #use to #include.
- Move content.kinetics.base.flwdata.* up a level.
- Move BeltInstance to the belt package.
- Make all instance fields public.
 2024-04-02 19:23:13 -07:00
Jozufozu
458f63820b Starting to visualize it 
- All visuals have their compile errors sorted out*
- I realize that flywheel flipped the semantics of rotate so that it now
  takes radians instead of degrees. I fixed everything I noticed but
  this will need follow up.
- Implement collectCrumblingInstances for every visual.

* Flywheel needs to re-implement stealInstance
 2024-04-02 19:23:12 -07:00
Jozufozu
5451a9afc7 Less than 400 errors 
- Lots of work on updating instances
- Pulled in some old utility classes from flywheel that were removed
 2024-04-02 19:23:12 -07:00
Jozufozu
6d9587b463 Doesn't build script 
- Update buildscript/gradlew and bump flywheel version
 2024-04-02 19:23:12 -07:00
simibubi
1e666e400d Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-11-02 12:20:29 +01:00
simibubi
aef8947e35 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 11:55:11 +01:00
simibubi
fff2512a67 Bump version 2023-11-02 11:48:09 +01:00
simibubi
ef1851e1fb Port fixups II 2023-09-20 20:44:51 +02:00
simibubi
f181799185 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-09-20 19:23:56 +02:00
simibubi
1439a52a37 3D 
- Trains can now travel through Aether Portals
 2023-09-20 14:34:01 +02:00
PepperCode1
78cf451f6d Merge branch 'mc1.19/dev' into mc1.20.1/dev 
Conflicts:
	gradle.properties
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/content/kinetics/fan/FanProcessing.java
	src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java
	src/main/java/com/simibubi/create/foundation/mixin/client/FixNormalScalingMixin.java
	src/main/java/com/simibubi/create/infrastructure/gametest/tests/TestItems.java
 2023-08-24 22:28:32 -07:00
PepperCode1
3bafe6fe40 Merge branch 'mc1.18/dev' into mc1.19/dev 
Conflicts:
	gradle.properties
	src/generated/resources/.cache/cache
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/compat/storageDrawers/StorageDrawers.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
	src/main/java/com/simibubi/create/content/decoration/copycat/CopycatModel.java
	src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java
	src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java
	src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticle.java
 2023-08-24 18:44:37 -07:00
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