Commit graph

3999 commits

Author SHA1 Message Date
attack8
4201a184a9 Add Ice Compacting Recipe and runData 2024-04-15 21:09:27 -04:00
attackeight
5277d5971d
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/mmc-1 2024-04-15 20:41:14 -04:00
IThundxr
b7bc7bc757
Allow big outlines in y axis 2024-04-06 19:39:41 -04:00
Star
d00517282a Minor ClipboardCloneable outline renderer oversight 2024-04-04 22:25:20 -04: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
42b1e19fc8 Light work
- Track the min/max sections contraptions reported themselves in
- When the current min/max sections don't match, invoke the notifier
- Track the min/max block positions contraptions collected light from
- When the current min/max positions don't match, re-collect all light
- Invalidate light before collecting
2024-04-02 19:23:14 -07:00
Jozufozu
99b886ce15 Cool and normal
- Minecraft does not rotate normals when you rotate a cuboid, which
  manifests as incorrect diffuse lighting in-game
- Set forge's calculate_normals to true for all rotated BB cuboids
- Fix some stray UVs on diagonal belts
2024-04-02 19:23:14 -07:00
Jozufozu
9cdc3ec231 Visual inspection
- Run through and fix a bunch of broken visuals
- Mostly things were missing setChanged
- Add CutoutPartial and BakedModel wrapper to force some partials to
  render as cutout
- Remove CutoutRotatingVisual
- Update most visuals to use the partial ticked passed to init and in
  VisualFrameContext
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
Jozufozu
7df37f7bff Unlit
- Remove last bits of FlwContraption rendering
- Remove ContraptionLighter
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
1c46bc8ae1 What's in a name
- Rename all *Instance -> *Visual.
- FlapData -> FlapInstance.
- Rename VisualizationContext variables.
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
PepperCode1
45c9e2c87a Potentially fix SBB and virtual block buffering 2024-04-02 19:23:13 -07:00
Jozufozu
d925d697cc Sweeping things under the rug
- Comment out some stuff to get it to compile.
- Pull in ModelUtil virtual stuffs from old flywheel.
- Update build.gradle to always download sources/javadoc in IDEA.
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
JensenJ
a9ec38d5e5
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2024-03-31 20:43:19 +01:00
IThundxr
d66170c8fe
fix: Schematicannon request wrong blocks (#5830)
* fix: schematics request tall grass block which is unobtainable (#5814)

* fix: give large ferns the same treatment

* remove unused imports

* comments

* fix requirement for farmers delight rich soil
2024-03-22 14:45:41 +01:00
Jay Turner
efb3cf490d
Add null-safety check on usage of BlockEntity.loadStatic (#6224) 2024-03-22 14:38:56 +01:00
attackeight
6802a1316b
Respect 'eternal' modifier from Forbidden and Arcanus in Deployer Recipes (#6231)
- We Could be Immortal
 - Fixes Creators-of-Create#6220
2024-03-22 14:35:10 +01:00
IThundxr
51db53c74f
Fix Copycat step placement helper (#6267) 2024-03-22 14:27:35 +01:00
IThundxr
41f957a94d
Fix changing bogey style not updating the block properly (#6273)
* Fix bogey block's placing the wrong block

* Clean the code up a bit

* Fix bitflag
2024-03-22 14:23:20 +01:00
IThundxr
7d3d4a1e7c
feat: Track Placement breaks flowers (#5821)
* feat: tracks break flowers during placement

* chore: cleanup import
2024-03-21 12:09:24 +01:00
KdotJPG
c92bbdda2d
Increase layered ore shape variation (#6158) 2024-03-21 12:01:31 +01:00
attack8
a15d7c5569 More Mod Compat 1
- Add Galosphere stone recipes like the Create stones
 - Add Elementary Ores compat
 - Add Infernal Expansion path pressing recipes
2024-03-19 20:13:45 -04:00
Jensen
9072693c0e Versioned Inventories for funnel input
(cherry picked from commit c8357b2d6ee6215d5d35ec74dd20f71b829c1811)
2024-03-19 05:30:15 +00:00
attack8
612f9f5efa Add Ice Compacting Recipe and runData 2024-03-18 16:16:08 -04:00
attackeight
f551107e6d
Move compat recipies to datagen (#5095)
* Separate config options for placing source blocks
placeFluidSourceBlocks ->
     fluidFillingPlaceFluidSourceBlocks
     pipesPlaceFluidSourceBlocks

* Add IC2 Metals compat

* Compat Datagen, pt 1

* Add IC2 Metals compat

* Compat Datagen, pt 1

* All Compat Recipes moved to datagen

* Add Oreganized and Galosphere compat

* Update HexCasting Compat

* Add The Vault Compat

* Add The Vault Compat

* Fix dupe bug added by last commit

* adding some wood missed previously

* add Nether's Exoticism Compat

* Update Mods.java

Remove duplicate enum entry

* Update CuttingRecipeGen.java

Reflect Mods.java update

* Update MillingRecipeGen.java

Reflect Mods.java changes

* Update PressingRecipeGen.java

Reflect Mods.java changes

* Update WashingRecipeGen.java

Reflect Mods.java changes

* Ok it's actually correct now

---------

Co-authored-by: NerdsOfAFeather <ftcteam18218@gmail.com>
2024-03-17 00:40:05 +01:00
zelophed
92975231d7 fix sugarcane acting as logs with mechanical saws
- prevent trees adjacent to sugar cane or similar blocks from being cut by the mechanical saw unintentionally
2024-03-17 00:22:01 +01:00
IThundxr
c4098b31b2
feat: Allow changing the goggle overlay tooltip icon (#5900)
* feat: allow changing the goggle overlay tooltip icon

* change method name
2024-03-16 19:31:05 +01:00
IThundxr
8ffc4ef96a
Fix deployer anti agro not working, and switch away from deprecated event (#6072)
* Fix agro, switch to non deprecated event as well

* spaces -> tabs
2024-03-16 19:18:07 +01:00
attackeight
866b619767
Add Unique Vertical Gearbox Crafting Recipe (#6171) 2024-03-16 19:13:55 +01:00
IThundxr
d9d4967100
Big Outlines API (#6187)
* Big Outlines API

* some more javadoc

* Has -> Have
2024-03-16 19:07:14 +01:00
IThundxr
298d1c1814
Fix #5998, Configs with the same key 2024-03-16 19:04:25 +01:00
IThundxr
2a5935db61
Make roller account for custom tracks 2024-03-16 18:56:18 +01:00
zelophed
04d1a53846 Support custom tooltip component heights in goggle overlay 2024-03-16 17:48:34 +01:00
IThundxr
5df8ed963e
small change: add Create's icon to .idea for intellij users (#5941) 2024-03-16 17:39:39 +01:00
Starlotte
b25b88c772
Add & implement spout & clipboard sfx (#5916)
* Add & implement spout sfx

* Add Clipboard Sounds

* Implement Clipboard Sounds

* Fix formatting for new sounds

---------

Co-authored-by: Starlotte <65743811+Starlotte@users.noreply.github.com>
2024-03-16 17:38:04 +01:00
cakeGit
3eece900aa
Merge branch 'Creators-of-Create:mc1.18/dev' into patch-2 2024-03-16 16:37:37 +00:00
IThundxr
5adb835502
Fix chromatic compound not working under y0 (#6227)
* Fix chromatic compound not working under y 0

* Switch away from constant
2024-03-16 09:27:18 -07:00