Commit graph

827 commits

Author SHA1 Message Date
simibubi
071482bb26 Ported Outline utility to 1.15
- Outliner can now be used in 1.15
- Ported Chassis range display to use new Outlines
2020-05-15 17:13:38 +02:00
tterrag
afd6ec17e0 Fix material blocks model generation, clean up unnecessary loot tables 2020-05-14 23:17:31 -04:00
tterrag
7f07a4af6e Remove PalettesRegistrate, can't have multiple datagens for same output 2020-05-14 22:32:36 -04:00
tterrag
02d052ed44 Port material blocks to Registrate 2020-05-14 22:07:19 -04:00
tterrag
7897968a63 Force generated jsons to check out with LF line endings on Windows 2020-05-14 21:12:58 -04:00
simibubi
c501de8c21 Merge branch 'master' into mc1.15/dev 2020-05-15 02:06:28 +02:00
simibubi
78b3d2c47e Goodbye, tools
- Removed shadow steel, rose quartz and blazing toolsets
- Removed some other unused assets
- Fixed limesand not registering an item
2020-05-15 02:05:01 +02:00
simibubi
12e0e55b0f Generating Stairs, Slabs and Walls
- All palette variants now have auto-generated stairs, slabs and walls for certain patterns
- Layered variant types have connected textures again
- Centralized all SpriteShifts
2020-05-15 01:23:27 +02:00
simibubi
a070792248 Generating Glass and Window Panes
- Re-implemented framed, tiled glass panes and window panes in the palettes registrate
2020-05-14 19:06:40 +02:00
Snownee
a4e7db5788
Merge pull request #313 from Snownee/fix-contraptions
Fix bell duplicating
2020-05-14 23:26:23 +08:00
Snownee
21bf4e8f01
Merge pull request #314 from Snownee/fix-deployer
Fix deployers getting stuck in water or bedrock as contraption (#310)
2020-05-14 23:25:47 +08:00
Snownee
463bf0b641 Fix super glue behavior. Fix super glue can stay between two unmovable blocks 2020-05-14 23:00:43 +08:00
Snownee
8d4e6895bc Fix bell duplicating 2020-05-14 21:42:52 +08:00
Snownee
ca4877430e Fix deployers getting stuck in water or bedrock as contraption 2020-05-14 18:45:34 +08:00
tterrag
702a79684b Fix server launch 2020-05-14 01:04:52 -04:00
tterrag
c3cdf346f7 Update Registrate, use onRegister function instead of CreateBlockBuilder 2020-05-14 00:53:12 -04:00
simibubi
deb03d10de Ported window blocks
- window and glass blocks entered the registrate
- updated palette textures
- removed windowlogging
- removed cocoa logs
2020-05-14 01:23:15 +02:00
simibubi
7536e22eed Connected Textures and Registrate
- CT behaviour is no longer tied to blocks implementing interfaces
- Custom models and connected textures can now be assigned in a custom blockbuider
- Ported framed glass to Palette Registrate
2020-05-13 21:56:46 +02:00
simibubi
bf57058e4e A new home for palette blocks
- Set up datagen for basic palette models and blockstates
- Overgrown blocks now follow foliage colour
- Paved blocks now connect vertically
2020-05-13 01:11:07 +02:00
simibubi
2696fc2a51 BlockState gen progress
- Clutch, Gearshift and Gearbox joined the registrate
- Fixed belt and gearbox items not being assigned creative tabs properly
- Cleaned up and extended the blockstate generator helpers
- Removed advancements from static assets
- Added datagen .cache to gitignore
- Split the palettes section into its own Creative tab
- Fixed Clutch and Gearshift rendering their casing in the TER
2020-05-12 14:06:50 +02:00
tterrag
7832e79b13 Update Registrate, remove now-unnecessary support code for block entries 2020-05-11 23:18:49 -04:00
simibubi
3eee3d2c87 Block entry wrappers
- Simi wants his helpers back
2020-05-11 22:34:02 +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
e69af69b0a Ported new changes to 1.15 2020-05-11 00:48:58 +02:00
simibubi
901c530f62 Merge branch 'master' into mc1.15/dev 2020-05-11 00:23:28 +02:00
simibubi
1fe647b16e Place & Crash
- Fixed some incompatibilities between kinetic blocks and schematic tools
2020-05-09 19:17:51 +02:00
simibubi
32cce4e9b9 Bug-fixes
- Reduced tracking range of mounted contraptions
- Fixed carpets not able to be pushed directly
- Fixed Water Wheels and Belt Tunnels crashing when rendered in a schematic preview
2020-05-09 18:32:47 +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
simibubi
0bd3a8d880 More portable blocks
- Fixed latch hotfix still not making it work properly
- Cocoa pods can now be harvested by harvesters
- Fans, RSCs, basins, stockpile switches, gauges, engines, cranks and other blocks can now be moved in a contraption
- Most of creates technical blocks can now be picked up using a wrench
- Fixed Stockpile switch not reacting to movement.
- Fixed Stockpile switch not reacting to changes to a double container
- Chassis range display no longer shows the overlay for non-sticky directions
2020-05-09 12:14:26 +02:00
simibubi
4cbf424f4d The Bugs win
- Condensed mechanical crafting into one JEI page category, scaling down slots if necessary
- Fixed ploughs trying to break water blocks
- Fixed stationary contraptions getting nudged around by expiring farmland blocks
- Shulker boxes can now be used as portable storage on contraptions
- Added vertical rotation support to buttons, levers
- Fixed certain directional blocks flipping around inconsistently when contraptions rotate by 180 degress
- Random safety checks
- Vertical belts no longer pop when rotated horizontally
- Fixed inconsistent funnel activation when items are inserted on the same segment
- Fixed adjustable pulley popping off due to floating point precision issues
- Fixed toggle latch acting strangely with input signals
- Schematicannons can now place belts safely
- Removed invalid Schematic item from creative tab
2020-05-09 00:09:10 +02:00
Snownee
505b251132 Fix build error 2020-05-09 01:05:56 +08:00
Snownee
6d67c6e30b Fix basin renderer causing crash 2020-05-09 01:05:41 +08:00
Snownee
774f1b5f56 Fix broken rendering state 2020-05-09 01:05:01 +08:00
simibubi
4b1c187d64 Config watching
- Fixed client and common config not being picked up by the configwatcher, thus not reacting to changes
2020-05-08 12:55:52 +02:00
simibubi
995357c32e
Merge pull request #304 from Snownee/mc1.15-fix-rendering
[1.15] Fix some rendering issues
2020-05-08 11:56:43 +02:00
Snownee
5f406d0b74 Fix: belt connector shows twice in creative tab 2020-05-08 11:53:46 +08:00
Snownee
1b040658e4 Remove invalid recipe. It seems BoP has removed this item 2020-05-08 11:43:55 +08:00
Snownee
97aba40cb4 Fix all blockstates 2020-05-08 11:42:54 +08:00
Snownee
5ac6ded468 Fix belt keeping dropping item in debug world 2020-05-08 10:42:01 +08:00
simibubi
65853c9da0 Creative Crate Revival
- The creative crate is back on the menu
- Schematicannons with creative crates no longer require gunpowder to operate
- Creative crates can now be used for infinite item supply and voiding
- Added a few more advancements
2020-05-07 19:52:36 +02:00
Snownee
9c5987310e Fix crash while opening JEI splashing category (Closes #297) 2020-05-07 22:23:47 +08:00
Snownee
e95e62f7ae Fix crash while rendering crafter 2020-05-07 22:22:57 +08:00
Snownee
5fb65d68f7 Fix JEI tab background is not transparent 2020-05-07 22:22:25 +08:00
Snownee
9b8c985b2b Fix blockstates json 2020-05-07 22:19:06 +08:00
simibubi
6c3c0600d3 Rebooting Advancements
- Reworked basic advancement tree, to be continued
- Removed unused trigger and damage source for sandpaper
- Added some new crate assets
2020-05-06 20:24:04 +02:00
simibubi
ef541493c5 Asset tweak
- Made new belt sprite less aggressive
2020-05-05 20:36:42 +02:00
simibubi
0f67b9afe2 Merge branch 'master' into mc1.14/dev 2020-05-05 20:26:53 +02:00
simibubi
d8c00dccb4 Merge branch 'master' into mc1.14/dev 2020-05-05 20:24:22 +02:00
simibubi
90afffd644
Merge pull request #299 from LordGrimmauld/master
the "count":<n> is now supported in recipe inputs
2020-05-05 20:23:58 +02:00
simibubi
c4513020df Schematics and Entities
- Fixed sidedness issue with glue effect packets
- Fixed duplication issue with Schematic tables
- Schematics can now include entities
- Schematicannons can now print:
    - superglue
    - (filled) item frames
    - (equipped) armor stands
    - end crystals
    - boats and minecarts
    - paintings
- Special blocks/entities placed by a schematicannon can now specify custom item requirements (used currently for belts & superglue)
- Fixed superglue not being rotated/mirrored correctly
2020-05-05 20:21:22 +02:00