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
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
5567e57265
Post-PR datagen
2021-03-03 16:34:10 +01:00
simibubi
9b87a2f123
Merge pull request #1186 from SuicidalSteve/comparator-tanks
...
Fluid Container Comparator Compat and Goggle Overlays
2021-03-03 16:31:17 +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
simibubi
20d8e1d915
Merge pull request #1130 from Alepod/patch-2
...
Update ru_ru.json
2021-03-03 16:22:02 +01:00
simibubi
fe6d9136fc
Merge pull request #1129 from Alepod/patch-1
...
Update ru_ru.json
2021-03-03 16:21:27 +01:00
JozsefA
b1dc36d358
Trying to tick everything is slow.
...
- Keep track of tickable instances separately.
2021-03-03 02:37:04 -08:00
simibubi
c1c6e5e046
Controlled attachment
...
- Added the Sticker, a redstone-driven block attachment component
- Fixed lighting of TileEntities lowered by a pulley
2021-03-03 05:21:58 +01:00
simibubi
5949dd376b
Fixed honey bottles on belt/depots
2021-03-03 02:34:57 +01:00
simibubi
e87849deca
Vector's food expansion
...
- Added honeyed apples
- Added sweet rolls
- Added chocolate glazed berries
- New goggles item model
- Other texture tweaks
2021-03-03 02:30:21 +01:00
JozsefA
5499fdbad0
The flappening.
...
Tunnel and funnel flaps are now rendered with the new engine.
2021-03-02 15:54:31 -08:00
simibubi
2e1129a3a5
Thinking about Gantries
...
- Added Ponder entries for gantry shafts and carriages
- Added ability to mark lang key prefixes as ignored, leaving out 'dev-only' lang entries from the localization templates
- Gantry Pinion -> Gantry Carriage
- Scenes can now be "re-assembled" by their storyboard while Ponder is opened using shift+refresh
- removed the requirement of editor provided lang keys for text windows
- couple fixes, changes to instructions
2021-03-02 05:53:43 +01:00
1e28bc998a
Make contraptions not take that stupid amount of cpu time when in water
2021-03-01 10:37:49 +01:00
simibubi
0a1be94cbb
Funnel Fantasy VII
...
- Finished ponder entries about funnels
- Smart TEs can now enter "virtual mode" to run both client and server code (support for it needs individual adjustment)
- Removed obsolete quads from the andesite funnels' model
- Not enough ponder instructions
- Fixed upright belt items in ponder UI
2021-02-28 23:49:51 +01:00
JozsefA
55f1b538b5
Only contraptions use EBOs now.
...
Tight light bounds for bearing contraptions.
2021-02-27 21:35:45 -08:00
JozsefA
884f19d518
Fix issue when rendering very large contraptions.
2021-02-27 18:29:35 -08:00
JozsefA
3a2771c5c0
Fix issue restricting the maximum size of contraptions.
2021-02-27 18:24:48 -08:00
simibubi
43f0ad1c78
Freeze and Identify
...
- Ponder scenes can now be paused and analysed, viewing tooltips for targeted blocks in the scene
- During editing, identify mode can be used to move targeted positions to the clipboard
- Ponder-compatible components can be pondered about in identify mode
2021-02-28 01:34:56 +01:00
_0Steven
23d7d65bb2
...Right, language datagen is a thing
...
- Actually put the lang stuff in the right files, and generate the other localization files...
2021-02-27 17:24:49 +01:00
_0Steven
8e5b5582f3
Fluid Overlays and Comparator Compat
...
-Add comparator compat to fluid tanks, spouts, and item drains.
-Add goggle overlays to fluid tanks, spouts, item drains, and basins.
-Update goggle item tooltip slightly.
2021-02-27 17:08:35 +01:00
simibubi
692c6deaaf
More pondering
...
- First couple of funnel scenes
- More utility methods
- Scene progress bar
- An inspect mode that does nothing
2021-02-26 19:46:56 +01:00
JozsefA
6dc4a18ed3
Extra safety checks.
2021-02-25 17:16:22 -08:00
zelophed
e1644c11e2
Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
2021-02-25 19:03:23 +01:00
zelophed
46bbdc70c9
small command adjustments
2021-02-25 19:03:07 +01:00
JozsefA
36e81857a3
Unmeddle the build script, but profiling is good.
2021-02-24 16:57:26 -08:00