Commit graph

1631 commits

Author SHA1 Message Date
JozsefA
376c4e1cb0 Fix crash rendering mechanical crafters on contraptions. 2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a Change the locks
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
2021-03-30 14:14:58 -07:00
simibubi
8a4eaef015 Fix tooltip whitespace 2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:49:13 +02:00
simibubi
ae340ccac0 Spooky ghost honey
- Fixed pipes drawing non-source honey from beehives
- Fixed deployers duplicating glass bottles
2021-03-30 18:48:57 +02:00
simibubi
dba1ff9c34 Port new Changes 2021-03-30 18:34:55 +02:00
simibubi
37c3625d4a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:34:40 +02:00
simibubi
3a6714fb08 Handy Tweaks
- Deployers now place block drops into their internal inventory
- Deployers can now harvest honey or honeycombs from beehives
- Pipes can now connect to and drain liquid honey from beehives
2021-03-30 18:10:24 +02:00
simibubi
389b2e0e90 Ponder fix-ups
- Input window elements no longer use integer coordinates
- Comfy reading is now a config option and persists across ponder UIs
- Disabled editor mode
2021-03-30 16:57:21 +02:00
simibubi
c2f3ebbf72 Fix Tooltips on 1.16 2021-03-30 16:32:19 +02:00
JozsefA
ff4a9e5c78 Fix arms glitching out on contraptions.
- Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.
2021-03-29 15:06:09 -07:00
grimmauld
358ff25031 Fix 1.16 too, i guess 2021-03-29 23:25:28 +02:00
zelophed
0b6098817e fix some wrench rotation issues 2021-03-29 20:31:08 +02:00
grimmauld
dadde271e4 Fix even more critical crashes, now on schematics 2021-03-29 18:19:17 +02:00
grimmauld
69f4c9f8ad Fix WrappedWorld.getLightingProvider being null and crashing 2021-03-29 17:19:18 +02:00
grimmauld
90b9a3aff9 Merge & Port 2021-03-29 10:57:50 +02:00
simibubi
5299204fb5 Better Tooltip Integration
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
simibubi
bf2a506bb8 A final thought
- Fixed non-splitting modes on brass tunnels
- Ponder scenes for ejectors and tunnels
2021-03-28 18:57:50 +02:00
grimmauld
caa3c57b71 Merge & Port 2021-03-28 10:58:25 +02:00
zelophed
683d18b994 tick off some todos 2021-03-28 04:19:58 +02:00
Kryppers
7de922f239 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-28 02:13:57 +01:00
Kryppers
1888f2d79b Update weighted_ejector_casing.png 2021-03-28 02:13:53 +01:00
simibubi
76bd3b3f50 Pondering too fast
- Added a button to slow down ponder scenes while any text is shown on screen
2021-03-28 01:52:04 +01:00
simibubi
fcae7e5c9a Motion commotion
- Update recipe for redstone contact
- Counteracted ejector inaccuracies caused by deferred activation
- Rewired ponder vertex sorting to evade Optifine incompatibilities
2021-03-28 00:45:14 +01:00
JozsefA
d28e60a059 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-27 16:38:36 -07:00
JozsefA
4e7777a130 Fix more instancing nonsense.
OrientedData was still applying the origin position shift, so some
things (mechanical presses) wouldn't appear in the right spot.
2021-03-27 16:35:47 -07:00
grimmauld
1739e72af0 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-28 00:21:13 +01:00
grimmauld
1bffb82ae4 Cogwheel refactor Part III
- Removed the calls to the AllBlocks entries where necessary
- Made placement helpers call the same code as CogWheelBlock.isValidPosition
2021-03-28 00:19:27 +01:00
JozsefA
5f49698a94 Fix mixer weirdness.
- Mixer and Press instances now use the quaternion shader.
2021-03-27 15:06:56 -07:00
grimmauld
7b022cd302 Cogwheel refactor Part II
- Refactored getStateForPlacement to reduce doubled code
2021-03-27 23:05:59 +01:00
grimmauld
4ff20b4217 Cogwheel refactor Part I
- Moved hasIntegratedCogWheel and isSmallCog to ICogWheel
2021-03-27 22:42:27 +01:00
Kryppers
213711ce77 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-27 21:09:19 +00:00
Kryppers
c239cec8b4 Update weighted_ejector_top.png 2021-03-27 21:09:17 +00:00
simibubi
3dd199e9d9 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-27 20:15:13 +01:00
simibubi
497ea4bb66 Foolish not to avoid the lack of counteracting no-clip
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
2021-03-27 20:14:55 +01:00
Kryppers
25bc102e92 New contact, who dis?
updated redstone contact textures.
2021-03-27 19:13:26 +00:00
grimmauld
6e0e3d28fd Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 19:15:57 +01:00
grimmauld
bec6b1d414 Try to make terraforged less angry against Create world gen 2021-03-27 19:15:52 +01:00
zelophed
a5a9ea1b7f ponder particles, pog 2021-03-27 16:33:23 +01:00
zelophed
c9ba76a2d1 Assisted Placement, Part IV-c
- indicator renders again
- changed the config to allow the indicator to be disabled altogether
2021-03-27 16:01:05 +01:00
JozsefA
fd98bd4976 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 01:10:42 -07:00
JozsefA
a7d714f8ba Fix for ponder particles yeeting Flywheel rendering.
I need to isolate the world load/unload stuff for
Flywheel anyway, a more robust solution is needed.
2021-03-27 01:10:01 -07:00
grimmauld
5dad567766 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 08:32:32 +01:00
grimmauld
9bc25db615 Keep everything up to date 2021-03-27 08:32:23 +01:00
JozsefA
4675e0ad15 Stop relying on IDynamicInstance#beginFrame to setup instance state.
- Gantry carriages no longer update when not necessary.
2021-03-26 22:59:47 -07:00
JozsefA
d3d338e64b STE tick optimization.
- SmartTileEntity#tick down to 3.32% from 11.64% cpu time.
 - Measured by JFR over 2 sessions each >8min.
 - Test world was the deployer fields.
 - Iterating over HashMap values is slow.
 - Collect TileEntityBehaviours into a list when the contents of SmartTileEntity#behaviours changes.
2021-03-26 22:02:19 -07:00
JozsefA
cf5eea5a10 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-26 17:31:41 -07:00
JozsefA
0b25f662dc Frame rate and tick rate limiting with distance.
- Significant performance improvement when dealing with massive amounts of dynamic instances, otherwise marginal.
2021-03-26 16:47:37 -07:00