Commit Graph

134 Commits

Author SHA1 Message Date
simibubi
12e5b95157 Yet more TextComponent nonsense
1.16 just keeps on giving
2020-10-20 21:03:43 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +02:00
simibubi
df252b3e30 Catching up
- remapped seat tooltips
- remapped outdated lang keys
- applied changes of #395 to 1.15
- Fixed Schematic hotbar overlay sometimes drawing on top of the item icon
- Fixed mechanical arm lighting and render bounds issues
2020-10-20 13:42:16 +02:00
simibubi
7ca8325b5f
Merge pull request #484 from gamrguy/extra-attributes
Extra attribute filters
2020-10-20 12:58:35 +02:00
simibubi
eea9811053
Merge pull request #460 from gamrguy/improved-saws
Improved mechanical saw rendering and contraptions
2020-10-20 12:47:37 +02:00
Bob Dole
b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-19 23:22:24 -04:00
simibubi
b7bed44a61 Basic Brewing
- Refactored JEI plugin to use a builder for categories
- The mixer can now process vanilla potion recipes
- JEI support for fluid potion mixing
- Refined some categories to not show obsolete information
- Compacting and automatic vanilla packing are now in separate tabs
- Fluids can now be manually picked up from a basin
- Basins and Spouts can now extract from and fill vanilla potion items
- Improved the filtering for fluid tests, such as the basin recipe and smart pipes
- Fixed CombinedTankWrapper losing nbt data of transferred fluidstacks
2020-10-19 22:07:05 +02:00
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-18 00:22:25 -04:00
simibubi
dd95096bfa Smart Fluid Pipes
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
2020-10-17 18:20:05 +02:00
Colman Davenport
6d51a6c730 Astral Sorcery Attributes 2020-10-17 01:25:29 -04:00
Colman Davenport
822ca6dad6 Lang 2020-10-17 01:17:25 -04:00
Zelophed
b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
2020-10-16 19:11:29 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +02:00
c9e2f8b05e Deforester works on slime saplings 2020-10-16 11:14:47 +02:00
simibubi
69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-14 21:06:46 +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
f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-13 20:57:30 +02:00
simibubi
d973e9bcdd JEI fixes
- Fluids in JEI now display the exact amount required
- Fixed short background of custom compacting JEI
- Fixed localization of sawing recipe category
- Fixed blocks waterlogged by a pump not scheduling a fluid update
2020-10-13 20:39:44 +02:00
Colman Davenport
a28b6bbdc3 Overhaul mechanical saw rendering
- Saws no longer use "RUNNING" blockstate
- Sawblade animates based on input speed
- Saws properly stop animating when inactive
2020-10-12 23:25:35 -04:00
simibubi
442d89e09e Port Changes to 1.16, Fix server launch 2020-10-12 22:16:06 +02:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
be8924a154 Port changes to 1.16 2020-10-12 16:25:57 +02:00
3e3b0dad6e port changes to 1.16 2020-10-10 22:40:59 +02:00
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
3956875334 The Coupling Capability
- Fixed concurrency / race condition issues with contraptions loading in during a collision cycle
- Reworked implementation model of minecart tracking and couplings
- Coupling items now get consumed when used in survival mode
- Added some player feedback when couplings cannot be created
- Fixed couplings disappearing on the client due to sync issues
- Wrenches can now remove minecarts in one hit
- Wrenches can now be used to remove couplings from minecarts
- Cart assemblers now attach themselves to the block above, no longer requiring active "sticky-ness" of the contraption towards it
- Minecarts can no longer be moved while a contraption is stalling them
2020-10-08 20:13:17 +02:00
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
e8c458f2ad Fix even more text components, now in tooltips 2020-10-06 15:54:16 +02:00
simibubi
bc4418a929 Port recent changes to compile 2020-10-04 01:59:51 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
a15937b5fc Fix datagen issues, ingame achieved! 2020-10-03 17:36:32 -04:00
simibubi
b14e94929c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-02 14:41:49 +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
fd9dd5feae apparently i messed with seats?
remove unnecessary texture key in seat model json files
2020-10-01 23:27:33 +02:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
simibubi
6e285e2f8b Valves and Valve handles
- Added a straight pipe variant to cut flows using rotational input
- Added a slower more precise variant of the hand crank
- Basins now render their contained fluids
2020-09-25 17:22:16 +02:00
simibubi
d9d5e60606 Workstation transfer, Part I
- Intermediate changes, probably doesn't even compile
2020-09-24 13:39:12 +02:00
simibubi
aef451e3bf Logistics' final stretch, Part II
- Belt observer -> Content observer
- Content observers can now monitor any inventory and funnel transactions
- Stockpile switches no longer only access slots exposed to a specific side of an inventory
- Stockpile switches can now take a filter
2020-09-20 21:34:36 +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
f58a7c8482 Fun with funnels
- Reworked funnel assets
- Andesite funnels can now be controlled via redstone input
- Re-introduced creative mounted storage
2020-09-14 21:10:38 +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
simibubi
651e06a70a Down the Refactor rabbit hole
- Reworked tileentity behaviours for inventory interaction
- Deployers no longer actively pull items from other inventories
- Some more work on basins
- Added a new inventory type wrapping an itemstack handler that automatically syncs the tile entity. It also implements IInventory for recipe shenanigans
- Held items of a deployer can now only be extracted by other blocks if it does not match the filter
- Fixed excess items not able to be extracted from deployers
- Removed some things
- Funnels no longer actively transpose items between chutes and inventories unless they are vertical
- Chutes can now active pull and insert items from/to inventories above/below them
2020-09-13 00:59:14 +02:00
simibubi
fe2c27db35 Spout refinements
- Fixed upright items rendering inconsistently between belt and depot
- Fixed various timing and sync issues with the spout
- Added a recipe type for spout filling
- Fixed more co-modification on belts
- Item and fluid nbt tags in recipes are now data-generated as json objects rather than strings
- Transported item processing can now leave items behind
- Transported item processing now has more meaningful result data
- Tweaked spout animation
- Fixed cullfaces on spout model
2020-09-11 14:31:26 +02:00
d73ebd0253 Changed polished stone crafting recipe to yield 4 stones to match polished vanilla stones and 1:1 stonecutter recipe 2020-09-05 20:48:34 +02:00
simibubi
5a7c09aa25 Filtered Basin Processing
- Basins can now be assigned a filter to narrow down the range of recipes that can be applied to its ingredients
- Some random asset updates
2020-09-04 15:16:07 +02:00
simibubi
213b504854 ProcessingRecipe Refactor
- Reworked and cleaned up Create's ProcessingRecipes
- Prepared ProcessingRecipes for fluid ingredients and outputs
- Added datagen infrastructure to ProcessingRecipes
- Migrated all hand-written ProcessingRecipes to generated
- Removed scrollinput on mixers
- Fixed recipe lookup cache not invalidating on datapack reload
- Removed "catalyst" ingredients
2020-09-04 01:23:09 +02:00
Zelophed
53e0c61da7 Mechanical Arm Round Robin
- added a scroll option to the arm that enables round robin for in- and output
2020-08-31 16:01:26 +02:00
simibubi
2855a22221 Grunthog Day
- Migrated Shaped and Shapeless crafting recipes to generated
- Added the reworked spout asset by Kryppers
2020-08-31 12:49:36 +02:00
simibubi
84079c769e Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-08-28 22:45:31 +02:00