Commit graph

1346 commits

Author SHA1 Message Date
simibubi
c0de8c4eb6 The grind continues
- Scenes for Millstone, Crushing wheels, blaze burners, basin, mixer, press, speedometer and stressometer
2021-03-19 20:05:55 +01:00
JozsefA
cef93ab0a8 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-18 14:37:03 -07:00
JozsefA
b7ec884b9c Includes, quaternions, and frames.
- Shaders can now reference other files with #flwinclude <"...">.
 - Shaders are now located in assets/flywheel/shaders.
 - Include paths are namespaced (a la ResourceLocation) and relative to the flywheel shaders root folder.
 - Optimized glsl rotations using quaternions (when applicable) and vectorized matrix construction.
 - Vectorize diffuse lighting calculations.
 - Micro optimization in SmartTileEntity.java
2021-03-18 14:36:37 -07:00
Snownee
7954aed0fd Disassemble contraption when bearing block being rotated by wrench 2021-03-18 23:26:15 +08:00
Snownee
3b36526443 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-18 18:49:43 +08:00
Snownee
d75793d036 Add extra item capability checks
Many mods does not invalidate their capabilities, so fix it on our end
2021-03-18 18:43:25 +08:00
simibubi
f7f51d1988 Ponder on Tracks
- Ponder scenes for the Cart Assembler
2021-03-17 23:31:30 +01:00
simibubi
cddc4a40f5 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-17 01:23:18 +01:00
simibubi
1d3e057dda Last kinetic relays and generators
- Fixed transparency depth sorting inside ponder UI
- Scenes for Seq. Gearshift, Furnace Engine/Flywheel and Rotation Speed Controllers
2021-03-17 01:23:16 +01:00
JozsefA
20da7c7761 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-16 15:52:45 -07:00
JozsefA
018c177f1e Better contraption actor instancing.
- Promoted actor instance creation to the ActorInstance class.
 - Drills and Harvesters' rotational speed is based on their movement speed with Flywheel on.
 - Deployers now use Flywheel.
2021-03-16 15:52:37 -07:00
simibubi
a897b5e78b Scene machine
- Fix funnels not rendering filter slot items
- Ponder scenes for the Deployer, Harvester and Plough
- Fixed uvs on Deployer model
- Ploughs can now harvest snow layers
2021-03-16 21:04:42 +01:00
zelophed
13a4d0ca62 funnel extraction
- allow funnels to extract items when part of a contraption
- also include a little animation for the new backtrack button
2021-03-16 17:21:32 +01:00
Snownee
e3394a8907 Allow attribute filter screen to have space to show JEI bookmarks 2021-03-16 21:56:04 +08:00
Snownee
ddb5aa9a3d Human friendly schematic selection 2021-03-16 15:38:20 +08:00
Snownee
8b5d5abc06 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-16 12:32:31 +08:00
simibubi
27eaf55b45 Another UI reshuffle
- 'Backstepping' is now a button
- Added little labels for hovered buttons at the bottom
- Moved ponder/transition-specific logic out of the generic screen class
2021-03-16 03:24:34 +01:00
JozsefA
9a545a09a4 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-15 15:58:51 -07:00
JozsefA
e1c16d869d Some semblance of immersive portals compat.
- Each world gets its own KineticRenderer now.
2021-03-15 15:58:41 -07:00
simibubi
e38d85a633 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-15 23:20:26 +01:00
simibubi
d9027c1d99 Logic Thinking
- Ponder scenes for various redstone components
2021-03-15 23:20:24 +01:00
JozsefA
52eed2bab3 Instanced Gauges and Valves, DRY lighting. 2021-03-15 14:20:13 -07:00
Snownee
a534d2230c Implement extra area for schematic table 2021-03-16 00:28:45 +08:00
Snownee
8281c5746a Fix ponder particles weirdness 2021-03-15 17:00:42 +08:00
Snownee
411925033e Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-15 13:02:05 +08:00
Snownee
0ca388141c Better line breaking 2021-03-15 13:00:55 +08:00
simibubi
f1b940ea18 Cutting imaginary trees
- Fixed TEs not ticking properly when wrap-around-skipping to a keyframe
- Added a block restoration instruction
- Scenes for the Saw
- runData catching up
2021-03-15 05:49:29 +01:00
simibubi
2bf9672d92 hotfix
- Oops. That didn't compile
2021-03-14 23:26:05 +01:00
simibubi
dac1cf0303 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-14 21:12:04 +01:00
simibubi
a8dc4f3622 Broken Breaking
- Painful implementation of virtual block breaking overlay
- Scenes for the Mechanical Drill
2021-03-14 21:12:02 +01:00
JozsefA
b71c831a07 Lieutenant Scatterbrain.
- User no longer has to manually add instances, new hook instead.
 - Use registrate for InstanceFactories.
 - Instanced levers.
 - Instanced hand cranks.
 - Reorganize PhysicalFloat and LerpedFloat.
2021-03-13 20:45:24 -08:00
simibubi
a40d0f58c2 Pondering about sticky stuff
- Scenes for chassis, super glue, stickers and redstone contact
- Added a warning when players try to use experimental rendering while shaders are active
2021-03-13 18:24:10 +01:00
JozsefA
d735d237ec Ghost blocks are less spooky. 2021-03-12 20:20:14 -08:00
JozsefA
a1e10a5c3c Belt speed = item speed and secret wrench fix. 2021-03-12 16:33:01 -08:00
JozsefA
f14661fb6f Pondering: the beginning and the end.
- Special-case seeking to the end of a ponder scene.
 - Draw indicators for seeking to the beginning and end.
 - Fix pulleys not rendering correctly.
2021-03-12 14:03:21 -08:00
simibubi
841bba04bd Pondering too quickly
- Fixed idle instruction only idling for t-1
- Made keyframe skipping a little easier
- Added option to register keyframes as part of a text window builder
- PonderUI now stalls the scene briefly after skips
2021-03-12 20:42:37 +01:00
simibubi
678ddfa764 Spoutput blockage
- Fixed basin auto-output not working on stopped belts
- Basin auto-output can now share a space with funnels
- Linear chassis no longer allow sticky sides facing a directly attached linear chassis of the same type
2021-03-12 18:44:05 +01:00
Snownee
af9ed3e44b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-12 23:51:20 +08:00
Snownee
6baa519973 Fix cart assembler duplication (closes #1058, #1150) 2021-03-12 23:46:26 +08:00
zelophed
438ac99b2d fix dist issues for dedicated server 2021-03-12 15:51:25 +01:00
zelophed
51c919e4d8 too much assist
- add a configurable range to placement helpers i.e. the pole helper specifically
2021-03-12 03:47:36 +01:00
JozsefA
154000290e Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
2021-03-11 16:34:46 -08:00
JozsefA
f9eb4dd2e7 Pondering back and forth.
- Only about gantries so far.
 - Reduce Backend log spam.
2021-03-11 15:59:26 -08:00
Kryppers
5e5289fcb0 Update secondary_linear_chassis_side_connected.png 2021-03-11 23:50:58 +00:00
grimmauld
f115233197 Fix leave finding in saws so compatibility with other mods works 2021-03-11 20:31:23 +01:00
simibubi
2a8c3debeb Captain Distracto, Part II
- Linear Chassis now connect to each other in any direction
2021-03-11 19:51:58 +01:00
grimmauld
d38f49fab6 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-11 18:39:22 +01:00
grimmauld
59303fea2f Extend /create ponder command functionality 2021-03-11 18:39:12 +01:00
zelophed
0448d3f6f3 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-11 15:29:40 +01:00
zelophed
60dbb931c1 double stick
- prevent super glue from being placed on already sticky faces
2021-03-11 15:27:17 +01:00
simibubi
4445872959 Stop hacking the base plate size
- Added proper scene scale/alignment instructions
2021-03-11 13:48:31 +01:00
zelophed
7eb0b95ab9 easier crank interaction
- allow some blocks to be used while sneaking and holding an item
2021-03-11 12:55:44 +01:00
simibubi
d1e96c3b4b Timewarp
- Added user view mode for editors to hide coordinates
- Ponder now pauses the game in SP
- Ponder elements now use a separate timer and separate partial ticks
- Fixed virtual funnels not flapping
- Fixed ponder buttons having hover highlights when not clickable
- Fixed ponder button mouse hitbox
- Addressed strange render state bleed with identify mode highlighting
2021-03-11 11:35:34 +01:00
JozsefA
ea90196250 Clocks are lit.
- ClockworkContraptions and BearingContraptions now both use the same lighter type.
2021-03-11 01:17:01 -08:00
simibubi
c73e3166cb Contraption Ponder Push
- Scenes for Pulley, Piston, and Clockwork Bearing
2021-03-11 03:32:18 +01:00
JozsefA
c54d80a161 Better bounding boxes for bearings.
- Fix bug causing entities to slip off the far corners of bearing contraptions.
 - This was already implemented for BearingLighter.java, now it's promoted to Contraption.java.
 - Promote anonymous WrappedWorld in Contraption.java to inner class.
2021-03-10 17:08:20 -08:00
JozsefA
b7f0fe9b10 Oops engine stuff is okay again. 2021-03-10 16:09:17 -08:00
JozsefA
d0a6f4123b Instanced flywheels, engines, and schematicannons. 2021-03-10 13:44:04 -08:00
simibubi
d8ab00b66e Pondering about Mechanical Bearings 2021-03-10 19:18:25 +01:00
JozsefA
2ddf57cd76 Instanced mixers and presses. 2021-03-09 15:46:15 -08:00
JozsefA
dcea504184 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-09 14:23:40 -08:00
JozsefA
95eabe9cf9 Instanced arms. 2021-03-09 14:22:20 -08:00
simibubi
cb063d161c Pondering about Windmills 2021-03-09 21:17:02 +01:00
simibubi
6b999fa7d4 Tag hopping
- Ponder UIs opened from a tag screen now skip to the first scene with a matching tag if available
2021-03-09 17:32:01 +01:00
simibubi
d252a204ef Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2021-03-09 04:24:48 +01:00
simibubi
d61b840c5c Back to fighting Minecarts
- Fixed Minecart Contraptions started on a powered rail facing in unwanted directions
- Fixed powered rail Cart Assemblers not respecting the solid block rule of powered rails
- Fixed Minecart contraption items not facing away from the player when placed
- Polished every last bit of the belt uvs
2021-03-09 04:24:45 +01:00
zelophed
a91360a7b9 changing format
- goggle overlays now use a localized number format
- minor changes to the layout of the ponder index screen
2021-03-09 03:45:05 +01:00
simibubi
62c3ae4040 Captain Distracto
- Removed processing recipes from recipe book
- Reorganized items in creative tab
- Tweaked a few model transforms
- Fixed belt uvs
- ponder birbs can now face the cursor
- fix interpolation on ponder birbs
- Fixed log spam when assembling certain blocks (Points of interest) in a contraption
- Fixed content observers not triggering for in-line belt funnels
2021-03-09 01:49:49 +01:00
JozsefA
33d718d653 Check if worlds support the flywheel backend. 2021-03-08 15:24:58 -08:00
JozsefA
2b37842259 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-03-08 14:04:25 -08:00
simibubi
6c8fe67fd4 Gradle Mondays
- Replaced ponderworld particle AT with reflection
- Symmetry Wand now checks for placement permissions
- Lang now uses Locale.ROOT
- Fixed crash using ponder without advanced tooltips enabled
2021-03-08 22:12:25 +01:00
JozsefA
e943705fb7 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev
# Conflicts:
#	src/main/java/com/simibubi/create/AllTileEntities.java
#	src/main/resources/META-INF/accesstransformer.cfg
2021-03-08 11:06:35 -08:00
simibubi
bea60ccb86 Fix build issues 2021-03-08 17:42:50 +01:00
simibubi
21d87a0cfe Change mixin repo 2021-03-08 17:29:42 +01:00
simibubi
1a315a11cf Merge branch 'mc1.15/ponder-ui' into mc1.15/dev 2021-03-08 17:29:06 +01:00
JozsefA
b31f4d09bd Housekeeping. 2021-03-08 02:27:56 -08:00
JozsefA
8ce0f47f01 No more 7 circles of callbacks.
- Instead of using consumers to edit instance data, just give the user a pointer to the data.
 - Easier to use, more predictable access.
2021-03-08 02:02:47 -08:00
JozsefA
d0e5be24d7 Transformed models. 2021-03-08 00:36:23 -08:00
simibubi
ca2cf94579 Scene hacking getting out of control
- New highly over-engineered scenes for Encased Fans
- Potential Fix for GL errors with the framebuffer system
2021-03-08 02:59:43 +01:00
simibubi
15e88b9bcf Belts
- Ponder scenes for the belt
2021-03-07 21:52:11 +01:00
simibubi
47b54b1ae6 Ponder me this
- auto-backtracking is now more generic and works for tag screens
- Ponder entries for water wheel, motor, hand crank and valves
2021-03-07 17:22:18 +01:00
JozsefA
bb3fed2a3b Towards better normals.
- Easier SuperByteBuffer transform settings.
 - Some cleanup here and there.
2021-03-06 21:46:17 -08:00
JozsefA
e930e62436 Belting these bugs.
- Belts now always render their items again.
 - Items on belts on contraptions are now at least somewhat lit.
2021-03-06 15:08:46 -08:00
JozsefA
25b4e4d5be The bell tolls for this bug.
- Fix MovementBehavior#onSpeedChanged not ever being called.
2021-03-06 14:33:01 -08:00
simibubi
3bc2a9e30f Sanity for translators
- Generated lang entries of re-used scenes now refer to the same set of keys
- Scenes for Chain Drive and Chain Gearshift
2021-03-06 18:08:03 +01:00
simibubi
aa0a58b0da Tooltips except it takes one hour per block
- Added and assigned more ponder tags
- Ponder Scenes for cog, large cog, gearbox, clutch, gearshift, and casings
- Fixed TE model data not queried on schematics and ponder scenes
2021-03-06 04:06:49 +01:00
simibubi
83a641c3b8 go teach them
- Ponder scenes for portable storage interface
- More work on tags
- Fixed tag screen on small resolution
2021-03-05 20:54:41 +01:00
JozsefA
25fdf08e11 Fog modes for new rendering.
- For each fog mode, compile a different version of each shader.
 - Could maybe do some fancier preprocessing to make writing shaders easier?
2021-03-04 23:43:28 -08:00
simibubi
e2c50663a5 UI and tag enhancements
- Fixed partial ticks on transitions
- Transitions center on clicked components
- Added auto-lang for tags
- Moved some other ui stuff around
2021-03-05 01:36:41 +01:00
JozsefA
b511a20814 Flappy packets.
- Instead of sending the entire tile entity (and maybe even chunk), send just what we need to.
 - Avoids unnecessary chunk rebuilds when flaps flap.
 - Beginning of a larger process to replace calls to SyncedTileEntity#sendData
2021-03-04 15:34:17 -08:00
zelophed
d590b23aa7 tagging along
- added tags and chapters to the ponder registry
- slightly changed how scenes are registered
- added a back stack to the screen opener and some animations to go along with it
- added a interface for icons drawn into screens
2021-03-04 12:58:26 +01:00
JozsefA
9062f1c8fa Null checks and flap updates. 2021-03-03 17:15:45 -08:00
JozsefA
fe492c5d75 Better instance deletions.
- Defer element removal until just before the model is drawn.
 - Use a modified version of ArrayList#removeIf to delete the instances and adjust the keys.
2021-03-03 17:14:19 -08:00
JozsefA
9d77f85b94 Fix crash on world reload. 2021-03-03 13:10:44 -08:00
grimmauld
93973004c8 Seats don't Like deployers. They just don't. 2021-03-03 19:33:15 +01:00
simibubi
8bf82aff79 Refactor Goggles Fluid Information
- Removed code duplicates
- Made fluid information more generic and concise
- Made fluid information easier to port
- Fixed potion fluid not overriding its translation key
- (I'm sorry, Steven)
2021-03-03 19:17:56 +01:00
simibubi
31cb704894 Refactor comparator overrides
- Removed unnecessary level tracking
- Remove code duplicates
- Fixed smart fluid tank behaviours not triggering markDirty on deferred fluid update
2021-03-03 17:59:27 +01:00
simibubi
562104341d
Merge branch 'mc1.15/dev' into comparator-tanks 2021-03-03 16:30:59 +01:00
simibubi
325ca68917
Merge pull request #1138 from SuicidalSteve/mc1.15/dev
[Bugfix] Make omnidirectional entity crushing more consistent.
2021-03-03 16:23:46 +01:00
simibubi
2b1c17cb48
Merge pull request #1133 from FrannDzs/patch-2
Update es_es.json (HOTFIX)
2021-03-03 16:23:01 +01:00