Commit graph

2017 commits

Author SHA1 Message Date
simibubi
dd7eedd1f0 Extra bracket validation #6271 2024-07-25 15:15:25 +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
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
283998711d Fix CME in minecart capability 2024-07-24 14:24:59 +02: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
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
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
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
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
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
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
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
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
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
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
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
f20dbd5cae
fix backtank nbt not saving
ForgeCaps don't save yet either though
2024-07-05 00:16:28 +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
5ad844daf9 Fence Gates on Trains
fixes Creators-of-Create#6354
2024-05-12 08:17:53 -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