Commit Graph

1969 Commits

Author SHA1 Message Date
simibubi
3093bf5917 Update HarvesterMovementBehaviour.java
- harvestpartial only breaks age zero crops if replant is disabled
2021-10-21 19:10:34 +02:00
simibubi
9443658431 Dummy beats null
- Implement #2228
2021-10-21 18:47:38 +02:00
kotakotik22
4d7f56d052 Merge branch 'mc1.16/dev' into movement_setting_provider_pr
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/config/CKinetics.java
2021-10-21 18:31:47 +03:00
kotakotik22
bc5c6bf21b Merge remote-tracking branch 'origin/mc1.16/dev' into movement_setting_provider_pr 2021-10-21 18:28:13 +03:00
Jozufozu
5a621bbea4 Fix crash during datagen 2021-10-19 15:29:04 -07:00
PepperBell
9870431db8 Miscellaneous refactors
- Refactor custom rendered items; The renderer now creates the model
instead of the other way around
- Only tick wrench cog rotation and linked controller renderer if client
is not paused
- Move all model swapping code from CreateClient to ModelSwapper
- Register client resource reload listener before initial resource
reload
- Use TextureStitchEvent.Post event instead of resource reload listener
for filling sprites of SpriteShiftEntries
- Reuse Random instance in PartialItemModelRenderer
- Make all config fields final
- Merge package foundation.renderState into foundation.render
- Move BreakProgressHook from package foundation to foundation.block
- Rename ResourceReloadHandler to ClientResourceReloadListener
- Rename ProperDirectionalBlock to WrenchableDirectionalBlock
2021-10-16 01:46:49 -07:00
simibubi
2bd10af1bc Ordered Crafter slots
- Connected Mechanical Crafters now strictly distribute added items from top to bottom, left to right
- Fixed smart pipe ponder scene no longer showing milk in the basin
- Added timed invalidation to refresh fluid handler references observed by pipe ends
2021-10-13 03:14:57 +02:00
simibubi
d1810f5173 Invisi-bucket
- Fixed filter slot display issues with Forge's multi-layered item models
2021-10-12 00:36:14 +02:00
simibubi
af9d6075ff Coolbox
- Added item description for the toolbox
- Fixed Smart Pipes not able to be picked up with Wrench
- Fluid Pipes no longer have to be straight in order to be 'wrenched' into a strictly straight windowed pipe
2021-10-11 23:24:22 +02:00
simibubi
3792e06b8a Observing Fluids
- Stockpile Switches can now be used with Fluid Tanks
- Content Observers can now be used with Fluid Containers and Fluid Pipes
- Fixed Pumps not updating pressure when reversed
2021-10-11 22:45:53 +02:00
simibubi
5ee4e61c27 Post-serialisation invalidation
- Fixed Contraptions eternally stalling when loaded back from a temporarily stalled state
2021-10-11 17:10:55 +02:00
simibubi
386a6f698b Stackable Breakable
- Fixed Belt connector items cancelling toolbox sync when their nbt changes
- Fixed Unbreakable items breaking when used as tool in deploying recipes
2021-10-11 14:53:42 +02:00
simibubi
7defbb18a3 Dyed Toolboxes
- Added dyed variants of the toolbox
- Toolboxes can now supply items via the "pickblock" keybind
- Toolboxes are now craftable
2021-10-07 16:16:24 +02:00
simibubi
b0143d604d Merge branch 'mc1.16/dev' into mc1.16/toolbox 2021-10-07 13:34:56 +02:00
simibubi
fae6e39b2a Super ignored
- Fixed pumps and valves not registering their stress impact properly after changing state
- Fixed belts not applying stress when created in certain orientations
- Fixed belt items flickering due to previous changes
2021-10-07 13:30:19 +02:00
PepperBell
1abc3a8bf9 Safe networking and more tag datagen
- Remove NbtPacket and add safe packets for configuring symmetry wand
and worldshaper separately
- Expand internal functionality of AllTags and use optional tags in most
cases
- Datagen tags forge:stone, forge:wg_stone, and forge:buckets/honey
- Fix attribute filter screen being shifted by one pixel
- Add translations for "fluid_container" and "renamed" item attributes
2021-10-07 00:05:35 -07:00
PepperBell
d72f343fdf Various cleanup
- Remove Create namespace restriction in CTSpriteShifter
- Add method to register ponder chapter lang
- Clean up palette block code; Closes #386
- Clean up tag code
- Use Create.asResource in as many places as possible
- Organize imports
2021-10-02 13:02:27 -07:00
simibubi
4d819b6c9d Structure Assist
- Schematic and Quill now creates Air entries in place of any "Structure Void" block
2021-09-30 21:31:35 +02:00
simibubi
34d430989c Belt Shadow Legends
- Fixed a lighting issue for the belt item renderer
2021-09-27 13:43:59 +02:00
simibubi
fa7039a04a Patient Stalling
- Items on belts now stall under empty-handed Deployers targeting them
2021-09-27 12:49:45 +02:00
simibubi
994fe29021 Careful Deploying
- Added the option to have held items not be consumed in deploying recipes
2021-09-26 20:45:24 +02:00
simibubi
b1047bb542 Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-09-23 01:25:32 +02:00
Stephen Barnes
a2043bebc5 Make FluidTransportBehaviour fields public 2021-09-19 01:23:16 -05:00
PepperBell
173eb6b7ab Add data driven potato cannon projectile types
- Allow defining custom potato cannon projectile types through JSON in
datapacks
- Separate PotatoCannonProjectileTypes into PotatoCannonProjectileType,
PotatoProjectileTypeManager, and BuiltinPotatoProjectileTypes
- Allow setting a custom render mode when building a projectile type
- Prevent the potato cannon itself from being used as ammo
2021-09-18 17:40:57 -07:00
Stephen Barnes
cff90d6211 Fix hose pulley particle position bug 2021-09-18 17:12:22 -05:00
Stephen Barnes
f9791243f8 Add config option to prevent placing fluid source blocks 2021-09-18 17:11:02 -05:00
Stephen Barnes
85d64010bd Config option to make mounted storage output-only 2021-09-18 16:14:40 -05:00
Stephen Barnes
576a5922b4 Add config options for harvesters 2021-09-18 15:22:44 -05:00
simibubi
4dc3629f5d Packing Up, Part II
- Toolboxes keep nbt on pickup
- Toolbox radial menu supports mouse wheel
- Added Dispose-all buttons
- Synced slots detach when moving stacks back into the toolbox
- Fixed missing data on client on login
2021-09-16 20:14:38 +02:00
simibubi
896ab01644 Packing Up
- Added the Toolbox
2021-09-16 04:10:34 +02:00
Jozufozu
092b16f80b Merge remote-tracking branch 'origin/mc1.16/dev' into flw/next 2021-09-14 13:18:05 -07:00
Jozufozu
0a11539961 LightPacking utility class 2021-09-14 13:17:14 -07:00
simibubi
1ec299deff Post-PR Datagen 2021-09-13 18:11:04 +02:00
simibubi
86b0d80c1b
Merge pull request #2178 from StephenBarnes/mc1.16/dev
Add config option for windmill sails per RPM
2021-09-13 17:46:11 +02:00
khj xiaogu
2d3b1e36f9
Added Option to fill infinite resources (#2071)
- Added fill infinite config option 
- Option to make hose pulley fill infinite sources
2021-09-13 17:30:31 +02:00
Tooster
72a8e24cf7
Extract CClient strings to constants (#2042)
Making it uniform with other config classes using static string holders.
2021-09-13 17:28:29 +02:00
Jozufozu
069506ae09 Initial data/struct format refactor
- Inspired by jellysquid3's vertex sinks
 - More robust/extensible solution for data writes
2021-09-12 14:49:01 -07:00
Jozufozu
2eef57204c Instancer interface
- Entire material/model system finally cleaned up
2021-09-12 09:40:37 -07:00
Jozufozu
6fcc960189 Separate LightVolume and GPULightVolume
- LightVolumes now can act as a light cache with configurable size
 - More GridAlignedBB changes
 - Remove ILightUpdateListeners
 - Simplify pulley rendering using LightVolume
2021-09-08 15:49:34 -07:00
PepperBell
6800c24c58 Fix command permission requirements
- Commands glue, highlight, and replaceInCommandBlocks now require OP
level 2 instead of 0
2021-09-05 21:14:41 -07:00
Jozufozu
d13bf42c22 Immutable view of GridAlignedBB 2021-09-04 19:57:32 -07:00
Jozufozu
e826b31a99 Moving light updates
- Better system for moving objects that want to receive light updates
 - LightProvider interface to better abstract light lookups
 - All light listeners use GridAlignedBBs
 - More utility in GridAlignedBB
2021-09-04 16:40:41 -07:00
Jozufozu
b0aba2d24a Merge branch 'mc1.16/dev' into flw/next 2021-09-02 20:23:04 -07:00
simibubi
aa3d656445 Hot belt replace
- The Wrench can now be used to shorten or divide Mechanical Belts
- Belt Connectors can now be used to extend or merge Mechanical Belts
2021-09-03 05:12:44 +02:00
simibubi
b05506ad46 Mechanicalacinahcem
- Added the option to prevent a Mechanical Crafting recipe from matching a vertically flipped arrangement
2021-09-02 23:58:38 +02:00
simibubi
31c951be65 Streamline Chromatics
- Crafters no longer display item sprites vertically flipped
- Crafters now arrange overlapping items less randomly
- Chromatic Compound can now absorb light emitting blocks from belts & depots
2021-09-02 23:08:03 +02:00
simibubi
aecd988384 Foliage Machine
- Mechanical Harvesters can now be used to gather Leaves
- Mechanical Harvesters can now be used to gather Weeping and Twisting Vines
- Fixed JEI integration of Basin recipes with multiple and/or stochastic outputs
2021-08-31 13:46:28 +02:00
Stephen Barnes
35e4956c02 Add config option for windmill sails per RPM 2021-08-29 21:56:28 -05:00
Jozufozu
c9789169b3 Light update convergence
- Move light update logic for all instances to use LightUpdater
 - Begin refactor of LightUpdater to account for moving listeners
2021-08-29 14:40:47 -07:00
42fac69721 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-08-29 12:27:42 +02:00
b734f73db3 made armor stands in ponder scenes less likely to break to null worlds 2021-08-29 12:27:33 +02:00
reidbhuntley
53774d64af Fix infinite source blacklist being ignored 2021-08-28 20:07:57 -04:00
Jozufozu
68a4478b38 Merge branch 'mc1.16/dev' into flw/next 2021-08-28 15:44:45 -07:00
PepperCode1
8a68911335
Merge pull request #2121 from Ovionyx/mc1.16/dev
custom namespace support of CustomRenderedItemModels
2021-08-28 11:58:20 -07:00
PepperBell
20b2ec4b63 Add CreateCustomRenderedItemModel
- Allows Create's classes to not have to pass the namespace every time
2021-08-28 11:53:45 -07:00
PepperBell
2b9c48b215 Add cake to upright tag
- Add missing override annotation
2021-08-28 11:20:02 -07:00
simibubi
dc0bdd055e Move to api package, also datagen 2021-08-25 17:49:01 +02:00
simibubi
fece0e39e2 Add-ons, behave
- Fixed idle blaze burners sending packets every tick
- Fixed placement indicator rendering behind the crosshair
- Added an Event allowing additional tileentitybehaviour objects to be attached to STEs from outside
2021-08-25 17:21:12 +02:00
simibubi
925c98792f (Sp)out of order
- Added behavioural registry for Spout/Block interaction
- Fixed and Refactored TiCon Casting via Spout
- Fixed fluid pipes getting stuck trying to waterlog non-solid blocks with fluid handling capabilities
- Fixed modlist lookup for non-english locales
2021-08-25 13:46:53 +02:00
f0736bdc41 Simplify the event to not include a te aware inventory 2021-08-24 17:15:43 +02:00
df0b9c3a17 getter for deployer fake player 2021-08-24 15:04:26 +02:00
ce32284d39 DeployerRecipeSearchEvent
- added an event to add custom deploying recipes for addons(that partly need more data and therefore can't use the existing deploying recipe json format)
- made deploying recipe scanning cancelable by event
- added a safety check to tile entity behaviours to prevent concurrent modification exceptions when loading old worlds (0.2 time, dev 0.3)
2021-08-24 11:17:47 +02:00
Jozufozu
6de4b92ad0 Interfaces and less log lines
- MateralManager, MaterialGroup, and InstanceMaterial are all interfaces
 - Separate (T)EI facing API from implementation
 - Comment out debug log in ModelPool
2021-08-23 22:34:29 -07:00
Talrey
b1bcb55838 okay now it works for real 2021-08-19 23:39:32 -07:00
Talrey
afca03de0b deployers work on the move now 2021-08-19 21:13:07 -07:00
Talrey
501e0fcf19 Deployer interactor partially implemented, can't swap items yet but can be wrenched 2021-08-16 00:44:34 -07:00
kotakotik22
30cef7025e Contraption movement setting API
- Renamed SpawnerMovementSetting to ContraptionMovementSetting and moved it to its own class
- Added a contraption movement setting registry
- Made checks previously checking only spawner movement setting and the block being a spawner to check using ContraptionMovementSetting.get(block)
2021-08-16 07:57:10 +03:00
QubicQuantum
80100ff504 fixed some stuff
a
2021-08-15 21:14:26 -07:00
QubicQuantum
7ddf11004b custom namespace support of CustomRenderedItemModels 2021-08-15 20:54:00 -07:00
Talrey
6c3337ae75 interaction behaviour doesn't invalidate _every_ renderer now 2021-08-15 16:00:04 -07:00
Mark Talrey
c6db66876a
Merge branch 'Creators-of-Create:mc1.16/dev' into mc1.16/interaction 2021-08-15 15:49:36 -07:00
Jozufozu
f1701ae784 Method to invalidate contraption renderers
- Call ContraptionRenderDispatcher#invalidate, at some point during a tick, and the structure will be reset.
 - Move contraption compartment to SBBContraptionManager
 - Contraption compartment uses custom pair with better hash function instead of apache commons pair
2021-08-15 15:10:58 -07:00
Jozufozu
5cb2eef157 Method to invalidate contraption renderers
- Call ContraptionRenderDispatcher#invalidate, at some point during a tick, and the structure will be reset.
 - Move contraption compartment to SBBContraptionManager
 - Contraption compartment uses custom pair with better hash function instead of apache commons pair
2021-08-15 15:10:35 -07:00
Jozufozu
322902d056 Some decoupling
- New Loader class in charge of loading and compiling everything
 - ShaderSources now only loads sources
 - ShaderSources is immutable now
 - Resolver singleton in charge of managing name resolutions
 - ProgramSpecs go through Resolver
 - WorldShaderPipeline no longer needs reference to ShaderSources
2021-08-10 15:20:52 -07:00
Jozufozu
208c6eff89 A heck of a lot
- Reorganize everything
 - Isolate SourceFile related things
 - Should consider decoupling ShaderLoader from resource loading
 - Document a lot of newer things
 - Index functions
 - Awkward WorldContext builder
 - Template responsible for providing shader inputs
 - Template is now an abstract class
 - Template provides GLSL version
 - ProgramSpecs now only accept one file
2021-08-10 02:06:23 -07:00
Jozufozu
cb47ca8452 Reload
- Redo shader loading
 - Now loads an immutable SourceFile containing some metadata
 - Replace legacy compilation pipeline with improved new one using new api
 - Builtins are defined in one file, now "header"
 - New ErrorReporter/ErrorBuilder methods
 - Fancier shader loading errors
2021-08-08 22:35:27 -07:00
Talrey
1539f30a3d First stab at interactors on contraptions 2021-08-08 22:21:48 -07:00
simibubi
5555f9e6bb Those don't mix
- Fixed 3x3 compacting recipes marked as Shapeless able to be processed by a mixer
2021-08-08 19:37:04 +02:00
simibubi
62f65e832a Give Widget 2021-08-08 16:26:44 +02:00
simibubi
45de01ff9e Attack of the remap, Part III
- Fixed Chute Particles not moving
2021-08-08 14:41:41 +02:00
PepperBell
019a61c444 Expose ponder instruction addition 2021-08-07 21:10:38 -07:00
PepperBell
67a7726f1c Ponder registration refactor
- Remove utility methods from PonderRegistry and only leave the one
essential method
- Move utility registration methods to PonderRegistrationHelper
- Move entry builder methods to entry class, PonderStoryBoardEntry
- Move listed tags list to tag registry
- Make ponder chapters namespaced
- Add localization and language datagen support for ponder chapters
2021-08-07 20:18:45 -07:00
simibubi
8edb9121cc Outstanding Performance
- Fixed Chutes pulling from inventories causing major framerate drops
- Fixed Chutes sending update packets when idling
- Added a max range for filter slot rendering of blocks
- Synced TEs are no longer able to cause side-effects by calling sendData on the Render Thread
2021-08-07 16:24:57 +02:00
zelophed
cc575a70c8 flash mich nochmal
- fix ponder buttons not flashing correctly
2021-08-07 02:46:16 +02:00
zelophed
370c813287 lost in the depths
- add a search box to config screens
- add a new screen that gives easier access to other mod's configs
- add a couple more config annotations
2021-08-07 02:09:12 +02:00
zelophed
ca02ac038f Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/ponder/SceneBuilder.java
2021-08-07 01:23:43 +02:00
Jozufozu
085ab2d7bc Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-08-06 12:14:13 -07:00
Jozufozu
0349d57929 Fix CI
- Javadoc doesn't like angle brackets
 - Add jar to artifacts
2021-08-06 12:13:51 -07:00
PepperBell
b19d92f6c2 Remove legacy TER light code
- TERs now pass in the light, so no need to recalculate it
- Make ContraptionRenderInfo.matrices final
2021-08-05 22:35:24 -07:00
PepperBell
333ef9ecbb Reuse contraption matrices
- Optimize memory usage by reusing ContraptionMatrices instances
2021-08-05 17:48:35 -07:00
MRH0
6173f9600c Integration support for Furnace Engine speed modifiers
+ FurnaceEngineModifiers which hold a Block -> float map of modifiers
~ Changed FurnaceEngineTileEntity to use the FurnaceEngineModifiers map instead of hardcoded modifier fro the Blast Furnace.
This will allow addon modders to change the speed modifier of a Furnace block.
2021-08-06 01:27:14 +02:00
Jozufozu
26fbe97ae6 Fix contraption shadow rendering with optifine
- More conventional naming for fields of ContraptionMatrices
 - Encapsulate fields in ContraptionMatrices
 - Move creation to RenderLayerEvent
 - De-clutter RenderedContraption#beginFrame
 - Bump flywheel version
2021-08-05 15:09:00 -07:00
Jozufozu
3e6e8c406b Bump Flywheel version
- Small tweak to contraption layer creation
2021-08-05 15:09:00 -07:00
PepperBell
b81fc66145 Sandpaper tag improvements
- Use already created sandpaper tag
- Use previous recipe's namespace instead of Create's when converting
sandpaper recipes to deployer recipes
2021-08-05 10:23:59 -07:00
simibubi
9f558cf419 Not a magic mod
- Fixed Auto-Compacting picking up special gated recipes from the mod Occultism #2070
2021-08-05 19:11:13 +02:00
simibubi
a6f893da7e
Merge pull request #2080 from mrh0/mc1.16/dev
Added tag for improved integration in DeployerApplicationRecipe
2021-08-05 17:58:42 +02:00
simibubi
8dd2f1dbf6 Schematic Problematic
- Fixed ammo-specific fire damage not dropping cooked drops from killed entities
- Fixed Schematicannons not visually aiming toward current block trajectory
- Fixed placed Schematics using smaller boundaries than the original
- Added the option to enable/disable placing air blocks with instant creative schematic printing
- Added safety check for Missing/Migrated filter attributes #2065
- Added safety check for Crushing wheels near unloaded blocks
- Added safety check for instant printing an invalid Schematic
2021-08-05 17:05:13 +02:00
MRH0
e8a6500434 Added tag for improved integration in DeployerApplicationRecipe
+ Added create:sandpaper to AllRecipeTypes and datagen.
~ Changed hardcoded list of sandpaper items to Tag.
This would enable me to include the Diamond Grit Sandpaper from CC&A in the deployer recipe. Node: There might be more applications for this tag.
2021-08-04 02:20:40 +02:00
Jozufozu
468435e1a0 Fix nullpointer when contraptions stop 2021-08-02 00:22:50 -07:00
PepperBell
c674b5df8d Fix linked controller rendering
- Fix unequip animation
- Fix button progress not resetting on unequip
- Optimize code
2021-07-31 19:10:17 -07:00