Commit graph

3974 commits

Author SHA1 Message Date
attackeight
cda65027b2 Fix Ore Crushing Inconsistency and add Gilded Blackstone Crushing
fixes Creators-of-Create#6440
2024-05-09 16:53:24 -04:00
attackeight
d8f989a370 Merge remote-tracking branch 'origin/mc1.18/wrenchprotectionrespection' into mc1.18/wrenchprotectionrespection
# Conflicts:
#	src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java
2024-05-09 16:21:21 -04:00
attackeight
4e51df3f81 Guard against chunk protections 2024-05-09 16:21:11 -04:00
attackeight
e9a17eb2f8 Guard against chunk protections 2024-05-07 20:25:30 -04:00
attackeight
6b8794b4f3 Change logic to make more sense 2024-05-07 07:01:23 -04:00
attackeight
f5c82022ce Any Armor Repaired by a type of netherite is netherite now
fixes Creators-Of-Create#6422
2024-05-06 23:31:26 -04:00
IThundxr
229b9a88e8
Fix #6240 2024-05-06 17:59:24 -04:00
IThundxr
f899bfe0ab
Fix #6205 2024-05-06 17:58:27 -04:00
IThundxr
bd96592339
Honey & Chocolate, the perfect combo
Fix Honey buckets and Chocolate buckets not showing up in creative tabs

Port of this commit: 446f693ca7
2024-05-06 17:40:21 -04:00
IThundxr
62a16a4070
prefix method 2024-05-02 20:06:16 -04:00
IThundxr
0414692d82
redo injector, shouldn't break between versions now 2024-05-02 20:02:29 -04:00
IThundxr
600fdb674e
switch back to IHM 2024-05-01 09:11:07 -04:00
IThundxr
4f4b21c0a5
modify fix 2024-04-29 15:18:13 -04:00
IThundxr
ded18c4ee6
Fix concurrency issue in IdentityHashMap 2024-04-29 12:15:30 -04:00
VoidLeech
ab4c29bc40
Switch conditions in getRequiredHeldItem and getProcessedItem 2024-04-29 16:27:57 +02:00
attackeight
eadb3608d8 Merge remote-tracking branch 'origin/mc1.18/mmc-1' into mc1.18/mmc-1
# Conflicts:
#	build.gradle
2024-04-26 16:56:05 -04:00
attackeight
60c001696a Add Ex Nihilo: Sequentia compat 2024-04-26 16:55:33 -04:00
attackeight
776c41ca84 Add Ex Nihilo: Sequentia compat 2024-04-26 16:54:59 -04:00
VoidLeech
12bf210f55
Fix filters ignoring 'respect data' option 2024-04-24 16:25:36 +02:00
HateMe
64a36fd2ae Added InItemGroup
Added the InItemGroup attribute filter back.
2024-04-19 17:26:54 +02:00
attackeight
971fae9c0e Allow Ponder to be re-bound 2024-04-17 21:22:16 -04:00
attackeight
5b1b8f22b0 Respect Manual Only Recipes
The following recipes will now respect the "_manual_only" recipe suffix
 - Sandpaper Polishing (Deploying)
 - Item Application (Deploying)
 - Smelting (Fan Blasting)
 - Smoking (Fan Smoking)
 - Blasting (Fan Blasting)
fixes Creators-Of-Create#5164
2024-04-17 19:15:47 -04:00
attackeight
53a483dde2 Accidentally forgot to comment these out 2024-04-16 21:04:01 -04:00
attackeight
79aea176f3 Ice and Fire Dragons Compat
- Silver Ingots
2024-04-15 22:15:31 -04:00
attackeight
dcfcf9e896 Merge remote-tracking branch 'origin/mc1.18/snowtoice' into mc1.18/snowtoice
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
2024-04-15 21:10:34 -04:00
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