Commit Graph

62 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
simibubi
b61dc0d562 Merge branch 'mc1.15/dev' into mc1.15/ponder-ui 2021-02-19 18:03:34 +01:00
simibubi
bfd666bb9c Sequenced Adjustments
- Added more descriptive names for sequencer instructions
- 'Await' instruction now requires a rising flank to trigger
- Fixed invalid json of german localization
- Ingored crushing wheel controllers facing in blockstate datagen
2021-02-19 16:55:45 +01:00
simibubi
2ece21a3ec
Merge pull request #962 from CookieNick/mc1.15/paused-sequenced-gearshift
Added the 'Paused' instruction for sequenced gearshift
2021-02-19 15:10:14 +01:00
simibubi
d59fea1079 Bloat.
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01:00
simibubi
203ca6f849 Birbs and Click input 2021-02-18 15:44:18 +01:00
Zelophed
159e298e8b paletted contraptions
- use minecraft's palette-map during serialization and deserialization to reduce compound size in most cases
- also update the placement_indicator sprite sheet
2021-02-17 17:21:31 +01:00
Zelophed
bec13b8e7d Assisted Placement, Part IV-b 2021-02-16 22:50:11 +01:00
simibubi
18067e8d5c Ponder
- rebrand
- support for particles
- support for fluids
- support for outliner
- coloured text labels
- debug scenes
- proper UI stuff
- proper layered rendering
2021-02-16 19:35:26 +01:00
simibubi
8ab27904db More Instructions 2021-02-12 17:08:48 +01:00
Nick Smit
44a3313c12 Added the 'Paused' instruction for sequenced gearshift, which waits for another redstone pulse to continue. 2021-02-06 21:07:24 +01:00
Snownee
5bd6110d59 Implement GuiBlockModelRenderBuilder tinting 2020-11-11 01:17:06 +08:00
simibubi
d5f08aab76 Brackets and spilled potions
- Added wooden and metal brackets
- Brackets can be applied to shafts, cogs and fluid pipes
- Brackets prevent pipes from connecting to adjacent pipes
- Fixed blockzapper not showing up in the searchable creative menu
- Added config values for hose pulleys
- Hose pulleys now extinguish lit waterloggable blocks
- Hose pulley now break blocks that cannot withstand vanilla fluid flows
- Spout is now wrenchable
- Fixed spout not activating properly
- Added fluid particles that supports fluids without a block variant
- Potion fluids now apply their effects to nearby entities when spilling from an open end
- Fixed pumps not rendering fluid particles when spilling/pulling fluids directly
- Hose Pulley no longer accepts fluids that cannot be placed
- Hose Pulleys and open pipes can no longer place water in the nether
- Some Refactors to the particle system
- Reverted reversed crtl activation for schematic tools
- Added a command to fix broken lighting in some of creates models (enables experimental forge block rendering)
- Fixed fluid ingredients in jei once again
- Fixed fluid tag ingredients being resolved on the client
2020-11-04 19:08:01 +01:00
simibubi
5abfc15e9e Destroyer of Lakes
- Added the hose pulley
- Added creative tanks
- Fixed sails not getting consumed when placed against each other
- Items can now be inserted onto belts regardless of it moving or not
- Fixed item duplication on stopped belts
- Refactored fluid block rendering in JEI
- Reworked model of the schematic table
2020-10-30 02:16:08 +01:00
simibubi
b14664d45f Windmill is Bearing is Clockwork
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
simibubi
62434fd564 That's hot
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
2020-10-14 20:52:38 +02:00
simibubi
699dc7bb5c Issues with Nested Config groups
- Fixed prefix "kinetics" added to unrelated subsequent config keys due to inconsistent push/pop
- Removed obsolete config values
2020-10-07 11:46:55 +02:00
simibubi
334bde9de5 Quality
- Visual rework of all active UIs
- Fixed large scale renderers such as belts, cannons, pulleys to disappear when partially out of frame
- Schematic and Quill now has the ability to convert a selection to a readied schematic instantly
- Moved option input of cart assemblers to side faces
- Fixed crash when attempting to smelt items on belts/depots
- Stockpile switches can now be inverted
- Fixed stockpile switches not dynamically updating gui indicators frequently enough
- Tanks can no longer be directly interacted with in survival mode
- Sequenced gearshifts now emit a comparator signal based on their current instruction index
- The Piston instruction for sequencers can now accept distances up to 128m
- Fixed some rendering inconsistencies with symmetry mirrors
- Reworked symmetry mirror models to match the tool better
- Attribute filters can now add inverted conditions to the list
- Added the attribute "can be crushed"
- Made the schematicannon interface a little less confusing
- Fixed launched items of the schematicannon rendering warped
2020-10-02 14:28:48 +02:00
simibubi
990d80412e Logistics' final stretch, Part I
- Brass tunnels once again have the ability to synchronize inputs among a chain
- Mechanical arms now have a range limitation
- Mechanical arms now wait with initialization until their area is fully loaded
- Chutes no longer ignore the direction of an attached fans air flow
- Chutes now render particles indicating their movement direction
- Chutes can now pull items up from belts or off the ground
- Fixed item model of shadow casing
- Fixed invisible quads under funnels when no casing is applied to the belt
- Belt mounted funnels can now be perpendicular to the belt theyre on
- Funnels can now transpose items like a hopper when facing down
2020-09-19 15:19:22 +02:00
simibubi
03cf441674 Distribution modes for tunnels
- Item distribution across belts using brass tunnels can now be configured with a wrench
- Added new icons for the distribution options of arms and tunnels
- Removed obsolete code
- Fixed some weirdness with creative crates and funnels
2020-09-13 22:00:11 +02:00
Zelophed
8e349380a5 fix tooltips getting occluded by certain gui elements
- addresses #412
- addresses #366
2020-08-21 20:46:09 +02:00
simibubi
f820e2be27 Mechanical Arm Implementation
- The arm blockitem can now be used to select inputs & outputs
- Arms now transfer items between inputs and outputs
- Arm support for Belts, Depots and Funnels
- Some safety checks in net code
- Minor refactor to NBTHelper
2020-07-01 22:02:00 +02:00
simibubi
78ad674c22 Re-organized packages and utilities 2020-05-23 14:02:38 +02:00
simibubi
029b7e2123 Merge branch 'master' into mc1.15/dev 2020-05-23 12:15:55 +02:00
Snownee
3890698a4b Fix GUI rendering order 2020-05-19 13:29:11 +08:00
simibubi
9c96ee8bb8 Removed Symmetry Particles from block registry
- Fixed fluid rendering in fan recipe JEI
- Made symmetry mirror models partials instead of blockstates
- Ported symmetry wand GUI Screen
2020-05-18 15:51:24 +02:00
simibubi
20ab49e46e Better game element rendering in GUIs
- Fixed uv issues with connected textures
- Fixed chromatic scope not showing on blockzappers
- Refactored game element rendering in user interfaces, such as JEI screens
2020-05-11 17:48:00 +02:00
simibubi
901c530f62 Merge branch 'master' into mc1.15/dev 2020-05-11 00:23:28 +02:00
simibubi
0a869190b2 Deployer dupes
- Fixed blazing sword taking damage in the nether
- Fixed blazing sword not igniting entities
- More safety checks
- Fixed stack overflow when overpowering a RSC from both inputs
- Fixed outrageous duplication glitch in deployer item handler
- Fixed crafters not able to return multiple buckets
- Super glue can now be used to make chassis sticky
2020-05-09 14:27:09 +02:00
Snownee
9c5987310e Fix crash while opening JEI splashing category (Closes #297) 2020-05-07 22:23:47 +08:00
simibubi
83ceb7d215 Merge remote-tracking branch 'origin/mc1.14-v0.2.3' into mc1.15/dev 2020-05-02 00:16:04 +02:00
simibubi
a97418e784 Better Schematics
- Visual rework to Schematic items and their interface
- Written Schematics can now be re-used in Schematic Tables
- Schematic and Quill selection is now smoother and more precise
- Schematics no longer re-render their preview every time they are re-positioned
- Schematic tools now move, rotate or flip the schematic more smoothly
- Schematic tools now render the new cuboid outlines rather than plain GL lines
- Fixed Schematics not rendering TileEntities in their preview
- Fixed inconsistent shifting when rotating Schematics with an "odd by even" size
- Fixed typo in Mechanical Press tooltip
2020-04-27 14:04:06 +02:00
simibubi
c62d356f9b Superglue
- Added superglue, an alternative to chassis blocks
- Added some random safety checks
- Fixed some more bad gl states left by event handlers
2020-04-20 23:27:34 +02:00
tterrag
a7c1ae3ec5 Fix crash in JEI rendering -- still far from functional 2020-04-04 22:08:57 -04:00
tterrag
f16e534a89 The rest of the compile errors, a few rendering fixes 2020-03-30 01:45:29 -04:00
tterrag
53f0524200 Some mass renames: onBlockActivated, Entity.posXYZ, etc. 2020-03-29 11:46:00 -04:00
tterrag
844dc42501 More porting work 2020-03-28 22:10:23 -04:00
tterrag
85d0d5244a Misc porting, mostly rendering. Mass rename RenderSystem/ILightReader
Under 500 errors!
2020-03-22 23:06:37 -04:00
simibubi
14e053fafd Sequenced Gearshift
- Added Sequenced Gearshifts
- Fixed custom swords breaking blocks when held in creative mode
- Fixed belts cancelling flight when touched
- Fixed Entities being blocked by contraption boundaries when moved on belts
- Fixed Flexpeater going funky when edited while active
- Fixed Links not firing when placed into a powered location
2020-03-11 21:40:55 +01:00
simibubi
aacc52d84a Refactored animated block partials
- Moved all block partials used only for rendering out of the registry
- Refactored model registry hooks and custom block model handling
- Added a safety layer for all tile entity renderers, addresses #76
- Overstressed indicator no longer shows when the kinetic source changes
- Fixed framed glass rendering glass textures inbetween blocks
- Fixed blockzapper adding itself twice to the item group
- Fixed basing not spawning particles properly
- Updated Forge
- Reworked Schematicannon model
2020-02-04 14:48:21 +01:00
simibubi
40e9a1ee41 The Filter Brothers
- Torque generators no longer show stress impact levels
- Added Filters for matching outputs against a group of items / nested filters
- Added Attribute Filters for matching outputs against a collection of item properties
- Extraction count on Extractors and Transposers can now be adjusted through scrolling on the value box
2020-01-19 19:29:39 +01:00
simibubi
7304f59f55 Merge branch '0.1.2' into 0.2 2019-10-30 01:23:40 +01:00