mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-30 23:05:03 +01:00
Code Issues Projects Releases Packages Wiki Activity
3982 commits 31 branches 14 tags 110 MiB
Commit graph

3761 commits

Author SHA1 Message Date
simibubi
67db1e50f1 Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2024-07-25 19:55:46 +02:00
simibubi
f6a4851140 Derployer 
- Revert #5266 in favour of fixing #5674, (#6048)
 2024-07-25 19:55:34 +02:00
simibubi
4b02decb4f
Merge pull request #6062 from IThundxr/mc1.18/fixDropperDupe 
Fix #4880 Dropper Dupe
 2024-07-25 19:40:34 +02:00
simibubi
c013173265 Fix CC:Tweaked setSchedule entries order 
- Port of #5973 to 1.18
 2024-07-25 19:21:58 +02:00
simibubi
f8cc7ab73c Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2024-07-25 18:47:15 +02:00
simibubi
4ce2971979 I'm not like other IDs 
- Added support for TFC wood types on water wheels #6092
 2024-07-25 18:47:04 +02:00
simibubi
7582646e37
Merge pull request #6065 from cakeGit/patch-1 
Added missing whitespace to TranslatingContraption.java
 2024-07-25 18:36:42 +02:00
simibubi
5fc2153d52
Merge pull request #6088 from cakeGit/patch-2 
Added station blockstate check
 2024-07-25 18:36:00 +02:00
simibubi
ad69b9f09d
Merge pull request #6110 from jodlodi/mc1.20.1/dev 
Implemented roots block tag for tree cutting
 2024-07-25 17:39:53 +02:00
simibubi
fc21d3abf6 Subcontraptions for some people #6119 2024-07-25 17:26:19 +02:00
simibubi
57a7b66553
Merge pull request #6145 from drwoops/bug-5921 
restore the invariant that draining is the inverse of filling (bug #5921)
 2024-07-25 17:06:29 +02:00
simibubi
8add39d24d Basin checks use blockentity instanceof 
- Implements #6172
 2024-07-25 16:56:35 +02:00
simibubi
625a1f38e6 Cannon Arithmetic 
- Schematicannons no longer consume additional gunpowder items until the previous item is depleted
- Condensed Schematicannon fuel config to a single shots-per-gunpowder value
- Schematicannons can now take gunpowder from adjacent inventories if necessary
- Fixed a typo in ponder
 2024-07-25 16:14:45 +02:00
simibubi
dd7eedd1f0 Extra bracket validation #6271 2024-07-25 15:15:25 +02:00
simibubi
f6dfe7d688
Merge pull request #6281 from Attack8/mc1.18/snowtoice 
Add Ice Compacting Recipe and runData
 2024-07-25 15:10:05 +02:00
simibubi
f8e8c476ad
Merge pull request #6285 from JensenJ-Modding/mc1.18/dev 
Versioned Inventories for funnel input
 2024-07-25 13:27:26 +02:00
simibubi
d84a7faa6a Merge branch 'pr/6288' into mc1.18/dev 2024-07-25 13:16:38 +02:00
IThundxr
96a05e70dd
Null protection & Readability changes (#6325) 
* Error Null cannot be Null

- Add more TrackEdge null protection
- Replace 2 for loops with enhanced for loops to improve readability
- Remove some unneeded unboxing
- Cleanup some interfaces
- Remove private from enum constructor, it's already private
- set enum value as final
- remove static from inner interfaces & enums

* Revert new Random()

* unused import
 2024-07-25 12:36:36 +02:00
IThundxr
2c98728b20
General code cleanup and small fixes (#6343) 
* redo switch statement using modern java's arrow case

* fix: Add moss carpet to brittle tag

fixes #6342

* update tags

* run datagen

* formatting

* fix comment

* fix comment
 2024-07-25 12:34:02 +02:00
simibubi
3d84836422 Backwards Approach 
- Fixed trains acceleration edge case at low speed settings #6348
 2024-07-25 12:26:23 +02:00
simibubi
067062ca62
Merge pull request #6704 from IThundxr/patch-1 
Disallow item extraction from crushing wheels with mech arms
 2024-07-25 11:03:13 +02: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
simibubi
283998711d Fix CME in minecart capability 2024-07-24 14:24:59 +02:00
simibubi
eaa4688a3f Fix normals on Flywheel model 2024-07-24 14:24:44 +02:00
Jozufozu
b3aba93665 93 days late 
- Add BlazeBurnerVisual
- Offload blaze burner's tickAnimation to flywheel when enabled
- Add generic scrolling instance type for the flame, to be re-used for
  belts
- Mark flame model json as cutout
 2024-07-22 15:26:26 -07:00
PepperCode1
3071e46ddc More Flywheel fixes and clean up 
- Remove BeltLighter
- Replace AbstractPulleyVisual's usage of LightVolume with new
LightCache
- Remove Box, MutableBox, and LightVolume
- Use AbstractBlockEntityVisual#relight without the pos parameter when
possible
- Use ExtraMemoryOps where appropriate
- Remove unnecessary init methods
- Organize imports
 2024-07-21 15:00:25 -06:00
simibubi
982fd502e8 Fix normals on Crushing Wheel model 2024-07-21 15:18:15 +02:00
Jozufozu
bbc30e41c7 Crank it! 
- Fix valve handle visual rendering a ghost instance
- Fix drills rendering garbage
 2024-07-19 21:42:56 -07: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
IThundxr
b6136dd215
disallow item extraction from crushing wheels with mech arms 2024-07-18 09:17:28 -04:00
simibubi
e32239299a Tidy up #6385 2024-07-18 13:11:17 +02:00
simibubi
0f3c2a6167
Merge pull request #6352 from starlottemusic/mc1.18/dev 
Minor ClipboardCloneable outline renderer oversight
 2024-07-18 11:36:18 +02:00
simibubi
7888c14082
Merge pull request #6356 from IThundxr/mc1.18/big-outlines-fix 
Fix IHaveBigOutline not working in the y axis
 2024-07-18 11:18:46 +02:00
simibubi
649a5936ec
Merge pull request #6385 from Attack8/mc1.18/ManualOnly 
Respect Manual Only Recipes
 2024-07-18 11:12:04 +02:00
Qther
1038b76d38
Performance improvements in several tick methods (#6697) 
* Performance improvements in several tick methods

Avoid capturing lambdas, streams, and Set#removeAll

* Update ServerSchematicLoader to not modify activeUploads while iterating in tick

* Replace iterator with enhanced for loop
 2024-07-18 10:24:50 +02:00
simibubi
1b34e52363
Merge pull request #6386 from Attack8/mc1.18/PonderRebind 
Allow Ponder to be re-bound
 2024-07-17 13:11:45 +02:00
simibubi
f09931c1a9
Merge pull request #6406 from VoidLeech/mc1.18/fix-filter-ignoring-respect-data 
Fix Filters not Respecting 'Respect Data' option
 2024-07-17 12:51:04 +02:00
simibubi
f964e892de Less drains More II 
- Fixed Potion buckets from Tinkers Construct not interacting correctly with drains and spouts #6316 #4124 #6415
 2024-07-17 12:46:20 +02:00
simibubi
ffa26fc0e4 PR Tweaks 2024-07-17 11:43:21 +02:00
simibubi
f9d96b2498
Merge pull request #6424 from VoidLeech/mc1.18/fix-invalid-deploying-recipe-error-msg 
Fix Deployer Recipe Error Messages
 2024-07-17 11:30:34 +02:00
simibubi
70a3cc9df2
Merge pull request #6427 from IThundxr/mc1.20.1/fix-creativetabs-concurrency 
Fix concurrency issue in Creative Tabs System
 2024-07-17 11:24:28 +02:00
simibubi
c3cf3b56e9
Merge pull request #6446 from IThundxr/mc1.18/fix-contraption-step-sounds 
Fix contraption step sounds
 2024-07-17 11:22:33 +02:00
22858
d941863803
Add wood cutting recipes for Regions Unexplored (#6457) 
* Regions Unexplored recipes

* silver birch recipes

* move silver birch recipes to CuttingRecipeGen
 2024-07-17 11:11:02 +02:00
simibubi
e8676cec09
Merge pull request #6458 from IThundxr/mc1.20.1/honey-chocolate-fix 
Fix Honey Buckets & Chocolate Buckets not showing up in creative tabs
 2024-07-17 11:08:27 +02:00
simibubi
50db9bc826
Merge pull request #6460 from IThundxr/mc1.18/controller-lectern-fix 
Fix NPE caused by empty lectern controller in a debug world
 2024-07-17 11:06:40 +02:00
simibubi
271ddab7e9
Merge pull request #6461 from IThundxr/mc1.18/wheels-from-below 
Fix Large Water Wheel Structural blocks catching on fire
 2024-07-17 11:06:00 +02:00
simibubi
856c1644a1
Merge pull request #6464 from Attack8/mc1.18/othernetherite 
Allow any fire resistant armor to be used in lava diving
 2024-07-17 11:03:15 +02:00
JensenJ
66ccb661f4
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2024-07-16 20:24:53 +01:00
simibubi
80b3ac89d0 Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2024-07-16 19:16:01 +02:00
simibubi
c05e366dc7 Refactor IWrenchable.onSneakWrenched 2024-07-16 19:15:45 +02:00
simibubi
f67341df7e Merge branch 'pr/6467' into mc1.18/dev 2024-07-16 19:03:15 +02:00
simibubi
8de19dbe02
Merge pull request #6468 from Attack8/mc1.18/ore-fixes 
Fix Ore Crushing Inconsistency and add Gilded Blackstone Crushing
 2024-07-16 18:55:36 +02:00
simibubi
661e5c5aef Baiting the hotfix 
- Fixed basin inventory pretending to accept full stacks when empty #3104
- Fixed basin spout outputs getting voided when targeting another basin #6451 #6474
- Fixed basin spout outputs not working when targeting a basin with a recipe filter
 2024-07-16 17:43:48 +02:00
simibubi
f29d26705c
Merge pull request #6482 from Attack8/mc1.18/gates-on-trains 
Fence Gates on Trains
 2024-07-16 16:24:40 +02:00
simibubi
00e919b6c7 Unusual Crafting 
- Fixed crash with JEI when a modded crafting recipe has an inconsistent ingredient list #6368 #6494
 2024-07-16 16:15:36 +02:00
simibubi
127724b23f Update BlockStressDefaults to use thread-safe maps 
#6579 by ByThePowerOfScience
 2024-07-16 13:25:04 +02:00
simibubi
08b5515068 Less drains More 
- Partially filled water cauldrons can no longer be drained by fluid pipes #6506 #6505
- Fixed forge capabilities on modded cauldron blocks getting ignored (?)
 2024-07-16 12:37:02 +02:00
simibubi
2446f8d195
Merge pull request #6542 from HDR/mc1.20.1/dev 
Fix #6245 : Display links not writing to signs
 2024-07-16 11:59:18 +02:00
attackeight
a5dc53ba5f
Goggle Tooltip code cleanup and ModernUI compat (#6477) 
* Goggle Tooltip code cleanup and ModernUI compat
fixes Creators-of-Create#6404

* Calculate indents based on font
thanks @Tidy-Bear

* exactPositioning workaround

---------

Co-authored-by: zelophed <github@zelophed.me>
 2024-07-15 17:14:56 +02:00
simibubi
3c9c668b56
Merge pull request #6592 from Layers-of-Railways/mc1.18/stabilized_contraption_fixes 
Fix Stabilized contraption offset and incorrect rotation
 2024-07-15 17:01:45 +02:00
simibubi
4b0c852e16
Merge pull request #6595 from IThundxr/mc1.18/less-glue-ticking 
Remove unnecessary glue ticking
 2024-07-15 16:53:50 +02:00
simibubi
9703417f1c Funnels in motion revisited 
- Fixed andesite funnels dropping full stacks when used in a moving contraption (PR #6602 by cshcrafter)
 2024-07-15 16:50:17 +02:00
simibubi
9beda447ef
Merge pull request #6659 from VoidLeech/mc1.18/correct-alexmobs-recipe-name 
Fix Alexmobs Lava Bottle Filling Recipe Name
 2024-07-15 16:21:04 +02:00
simibubi
15f426d9c6 Tag me back 
- Backtanks now keep track of item capability data in their placed block #6186
- Backtanks no longer ask for an unobtainable item when placed with a Schematicannon
 2024-07-15 16:17:28 +02:00
littlej541
54f760feb1
Goggles function in any curio slot (#6520) 2024-07-15 15:14:48 +02:00
IThundxr
1722d4dda0
Total Ram info inside DebugInfo command (#6507) 
* add total ram available info to DebugInfo command

* remove unused import
 2024-07-15 15:07:52 +02:00
zelophed
398eb64880 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2024-07-15 14:45:36 +02:00
zelophed
d9198f678e rework ThresholdSwitch compat 
- adds better support for SophisticatedStorage and FunctionalStorage
 2024-07-15 14:45:23 +02:00
simibubi
cbfbfb9e74
Merge pull request #6662 from VoidLeech/mc1.18/backtank-preserves-nbt 
Make Backtank preserve NBT on placement.
 2024-07-15 14:11:10 +02:00
simibubi
3f6efe5520
Merge pull request #6664 from NotSoEpic/mc1.18/dev 
Encasing blocks plays a placing sound
 2024-07-15 13:46:52 +02:00
simibubi
4953dbb181 Merge branch 'pr/6677' into mc1.18/dev 2024-07-15 13:36:30 +02:00
simibubi
4f6ab55858
Merge pull request #6674 from drouarb/mc1.18/dev 
- Optimised item rendering on belts and depots
 2024-07-15 13:11:03 +02:00
simibubi
4b3dcc32ab Equals does not equal not equals 
- Fix inverted fluid comparison from a recent PR
 2024-07-15 12:58:38 +02:00
simibubi
7bd602a33f The Dupe Chute 
- Fixed a duplication bug involving belts and chutes #6210 #5781 #6686
 2024-07-15 11:44:30 +02:00
drouarb
03973c4dc5 Culling item on belts 2024-07-11 00:00:27 +02:00
drouarb
9dfbe061de Preserving BakedModel and switching to ItemRenderer.render instead of ItemRenderer.renderStatic for performance 2024-07-09 20:44:10 +02:00
IThundxr
4486b16917
fix schematic visual not disappearing after item dropped or unfocused in hotbar 2024-07-08 18:37:14 -04:00
NotSoEpic
ee41e0f04e Encasing blocks plays a placing sound 2024-07-06 08:41:41 +08:00
VoidLeech
caf79d40ae
Revert "Preserve getOrCreateStack" 
This reverts commit a6f5c51d6a.

Would duplicate the enchants on the backtank
 2024-07-05 02:29:33 +02:00
VoidLeech
a6f5c51d6a
Preserve getOrCreateStack 2024-07-05 01:08:44 +02:00
VoidLeech
d67f345146
remove unused imports 2024-07-05 00:57:11 +02:00
VoidLeech
f20dbd5cae
fix backtank nbt not saving 
ForgeCaps don't save yet either though
 2024-07-05 00:16:28 +02:00
VoidLeech
153423cc37
fix alexmobs compat recipe name 2024-07-04 01:30:34 +02:00
attackeight
67f77cf0b5 Change from item to tag for sturdy sheet production 
(closes Creators-of-Create#6655)
 2024-07-03 19:20:42 -04:00
TelepathicGrunt
75d337ba8c
Use safer fluidstack comparisons in FluidIngredient (#6317) 
* Use safer fluidstack comparisons

* switched to getFluid check
 2024-06-23 15:46:36 +02:00
IThundxr
d8eeaf1220
remove unnecessary glue ticking 2024-06-14 15:52:54 -04:00
techno-sam
f9c966d6a8
I'm totally stable 
fixes Creators-of-Create/Create#3640 and Creators-of-Create/Create#6590
 2024-06-12 15:49:08 -07:00
attackeight
7e512a37c7 Move curios tag and upgrade aquatic tree fertilizer recipes to datagen 2024-06-01 07:54:57 -04:00
HDR
f49bb7822b Fix displayLink not being able to write to signs 2024-05-30 10:22:48 +02:00
PepperCode1
02dca46855 SuperByteBuffer fixes and improvements 
- Use color as a multiplier instead of override
- Always use maximum of provided light and stored light
- Use stored overlay if overlay value is not provided
- Use shader light directions to calculate diffuse
- Require providing level when using level light
- Reuse objects
 2024-05-26 14:21:06 -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
PepperCode1
669c748bd1 Fully fix unshaded geometry in SBBs 2024-05-21 17:22:47 -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
PepperCode1
79e1c8c950 Restore SBB contraption rendering 2024-05-16 21:35:24 -07:00
PepperCode1
7d265eb2c1 Rename instance to visual in builders 2024-05-16 21:35:15 -07:00
attackeight
5ad844daf9 Fence Gates on Trains 
fixes Creators-of-Create#6354
 2024-05-12 08:17:53 -04:00
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
4e51df3f81 Guard against chunk protections 2024-05-09 16:21:11 -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
60c001696a Add Ex Nihilo: Sequentia compat 2024-04-26 16:55:33 -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
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
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
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
Max Mielke
bb7e835a8d
Merge pull request #5826 from IThundxr/mc1.18/fixSignalNPE 
fix: Signal Group NPE
 2024-03-16 17:20:44 +01:00
Max Mielke
cbaab918ae
Merge pull request #5772 from IThundxr/mc1.18/track-advancement-fix 
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS
 2024-03-16 17:05:50 +01:00
IThundxr
7800328bbd
remove unused imports 2024-03-05 15:33:45 -05:00
GizmoTheMoonPig
3c9cc6cd1d
oops 2024-02-28 17:24:38 -07:00
GizmoTheMoonPig
1a4e71cb0d
move conductor hat information to resource packs 2024-02-28 17:20:35 -07:00
jodi / jodlodi
adcfefba37 Forgot about twilight forest's mangrove roots 2024-02-21 17:35:19 +01:00
drwoops
757f4e2699 restore the invariant that draining is the inverse of filling 2024-02-19 10:37:56 +01:00
jodi / jodlodi
b3db759b0c Implemented roots block tag for tree cutting 
With added optional tag entries for Twilight Forest's root blocks
 2024-02-12 16:57:46 +01:00
cakeGit
378e970005 Added station blockstate check 2024-02-07 20:12:41 +00:00
cakeGit
ffd605f8ac
Added missing whitespace 2024-02-03 12:56:37 +00:00
IThundxr
d62774ff65
Fix #4880 2024-02-02 19:23:36 -05:00
Blazified
d9b40a0397 Fixed Potato Cannon Shooter Credit 
Projectile and shooter were the wrong way round in the damage method. This resulted in some enchantments not taking effect, no EXP, and no contribution to killed stats.
 2023-12-14 08:48:33 +00:00
VoidLeech
aa479c56fe Make automated brewing of modded potions use the same fluid amount as vanilla recipes 2023-12-12 20:01:47 +01:00
VoidLeech
c707fbd448 Fix modded potion recipes using uncraftable potion in automated brewing 2023-12-12 19:53:57 +01:00
IThundxr
ff4eb581fc
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/fixSignalNPE 2023-11-30 09:24:52 -05:00
IThundxr
fbc62d4ba2
fix: signal group NPE 2023-11-30 09:22:58 -05:00
IThundxr
a6079ff9af
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS 2023-11-19 14:44:35 -05:00
homok43
37b58a82f4 Fixed memory leak 2023-11-04 17:12:50 +01:00
simibubi
a41053b896 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-11-02 15:35:37 +01:00
simibubi
26fc820c69 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 15:35:09 +01:00
simibubi
2201d87da7 Asset patches 
- Fixed uvs on stress- and speedometers' block models
- Toolbox hotbar slot overlay now uses the revised brass palette from 0.5.1
 2023-11-02 15:30:32 +01: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
8e323d03c9 1.19 datagen 2023-11-02 11:41:34 +01:00
simibubi
6e19661bf9 Port Changes 2023-11-02 11:32:38 +01:00
simibubi
04406690ca Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 11:32:20 +01:00
Crowdin Bot
6e5aced6b8 New Crowdin translations by Github Action 2023-11-02 10:00:49 +00:00
simibubi
962f03c1c5 Sisyphus's broken printer 
- Fixed Schematics failing to load when containing items with sensitive nbt #5680
- Fixed Turntable handler causing a crash during world shutdown #5696
- Cached outputs of BeltHelper.isItemUpright()
 2023-11-02 10:57:00 +01:00
simibubi
eea8bb2607 Filter code caused global warming 
- Contents of a filter are no longer deserialised from item nbt each time a stack is tested
- FilteringBehaviour.getFilter() no longer creates a copy of the item
- MovementContext for contraption actors now have a shortcut to a cached filter from their corresponding BlockEntity
 2023-11-02 00:08:34 +01:00
simibubi
d6708cef3b Collide on sight 
- Trains check their distance before running full collision tests
- Trains can no longer collide when on separate track networks
- Micro-optimised some streams and map value iterators
 2023-11-01 20:22:29 +01:00
simibubi
77ba1e8bf6
Merge pull request #5681 from TimovVeen/mc1.18/pathfinding 
Train navigation optimization
 2023-11-01 14:17:51 +01:00
Timo van Veen
3c3ce93fa1 final cleanup 2023-11-01 13:56:53 +01:00
simibubi
bc340c7d3e Implement #5666 on main branch 2023-11-01 12:56:14 +01:00
Timo van Veen
30a90a6203 Fix crash on invalid schedule regex (e.g. "station \\E1\\Q") 2023-10-30 19:50:58 +01:00