Commit Graph

2294 Commits

Author SHA1 Message Date
PepperBell
8f6dcb8ba6 Fix resource leak
- Fix ponder resources not being closed properly
2021-07-22 16:13:03 -07:00
PepperBell
37261ee8e6 Update Forge
- Bump minimum required Forge version to 36.2.0
- Re-add chorus teleport event compatibility
- Update Flywheel, JEI, and Shade plugin
2021-07-22 14:16:00 -07:00
Jozufozu
b188f97ae0 Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt 2021-07-22 14:10:20 -07:00
Jozufozu
89c34262d0 Flaps no longer use old origin pos behavior 2021-07-22 14:06:48 -07:00
PepperBell
c3f87ec347 Recipe interface
- Add IRecipeTypeInfo to replace AllRecipeTypes method calls in most
cases to allow for better addon support
- Tweak some visibility modifiers
2021-07-22 13:40:40 -07:00
garyantonyo
2ded6bd2fa Remove flooring of damage as it no longer is useful with the new damage calculation 2021-07-22 11:20:49 -04:00
garyantonyo
35778640ba Flooring is always done on damage calculation, so add it to the description tooltip too? 2021-07-22 11:16:44 -04:00
garyantonyo
64e822626e update PotatoCannonItem damage description to reflect changes to PotatoProjectileEntity 2021-07-22 11:12:21 -04:00
Jozufozu
a52b6d766f MaterialGroups and massive refactors
- Move material stuff to its own package
 - The various render functions in the material tree now bind to specific render layers
 - Instancers can choose which layer to use
 - The layers are SOLID, CUTOUT, and TRANSPARENT
 - More layers are likely unnecessary, but we'll see
 - Deprecate functions in MaterialManager in favor of more builderesque ones using MaterialGroups
 - Catching up with Flywheel
 - Remove MatrixStacker in favor of Flywheel's TransformStack (thread safety too)
2021-07-21 20:30:35 -07:00
PepperBell
2cea2e1c0f OpenEndedPipe effect API
- Allow registering custom effect handlers for open ended pipes
- Add some getter methods to OpenEndedPipe
2021-07-21 14:48:39 -07:00
PepperBell
0c3696dd21 Extra alternative
- Rename AnimatedKinetics#defaultBlockElement to
AnimatedKinetics#blockElement
- Add static alternative to AnimatedKinetics#blockElement meant to be
used outside of subclasses
2021-07-21 12:49:55 -07:00
Themba Dube
f1815e1d2d Fix capitalization in English subtitles 2021-07-20 19:44:20 -04:00
PepperBell
d5e659dad2 Merge remote-tracking branch 'upstream/mc1.16/creative-cake' into
mc1.16/dev

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
2021-07-18 19:47:39 -07:00
simibubi
1e7078fe56 One-liner marathon
- Version bump
- Implement #1969
- Guard emptying JEI integration from empty item outputs, addresses #1994
- Goggles icon no longer renders when menu button is set invisible, addresses #1979
- Fixed missing blaze burner in JEI's display of heated compacting recipes, addresses #1970
2021-07-18 17:37:14 +02:00
PepperBell
9923f04ff5 Allow building sequenced assembly recipe directly
- Resolves #1991
2021-07-17 20:53:39 -07:00
PepperBell
f4eaf6fff4 Tweak creative particle colors to match palette 2021-07-17 18:01:54 -07:00
PepperBell
01366e30bb Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/creative-cake

Conflicts:
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-07-17 17:52:39 -07:00
PepperBell
4bdd802170 Organize imports 2021-07-17 00:46:35 -07:00
PepperBell
ca94873148 Ponder namespace refactor
- Add full support for custom namespaces in ponder
- Make ponder files use Minecraft's resource system
- Allow easily registering and generating ponder lang for any namespace
2021-07-17 00:39:05 -07:00
PepperBell
1dd7c4bc1e Minor cleanup changes
- Change AllRecipeTypes to have less repetition and force getter usage
2021-07-16 15:11:28 -07:00
PepperBell
7ec02fd040 Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/creative-cake

Conflicts:
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerHandler.java
	src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java
2021-07-15 13:21:47 -07:00
d53e89887a fix obfuscation reflection helper calls 2021-07-15 11:45:45 +02:00
9e4198fa79 fix mixins 2021-07-15 11:39:37 +02:00
a048285699 Bulk remap, compiles 2021-07-15 11:32:03 +02:00
PepperBell
0088a5c404 Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.16/creative-cake 2021-07-14 16:07:48 -07:00
PepperBell
8f4be44a6d Fix blaze cake burn time
- 240 ticks/1.2 items -> 6400 ticks/32 items
2021-07-14 16:00:29 -07:00
PepperBell
777d47ca8b Fix depot rendering and potato cannon model
- Upright items were reflected when rendered on depots
- Potato cannon model had itself as parent and faces with invalid
texture
2021-07-14 15:12:59 -07:00
PepperBell
a17dd26aab Add creative cake
- Item texture and particle colors are not final
2021-07-14 13:29:02 -07:00
reidbhuntley
f3a521121d Advanced Arm Applications
- Mechanical Arms remember their targets when placed by Schematicannon (for real this time)
- Mechanical Arms will now rotate/mirror their targets when rotated/mirrored in a schematic or contraption
2021-07-12 22:03:22 -04:00
simibubi
2300e0e58a Bug Fixes
- Copper backtanks can no longer accumulate air pressure when waterlogged
- Copper backtanks now emit a comparator output
- Removed id prefix requirement for ponder and seq. assembly tooltips #1931
- Improved the odds to succeed of existing sequenced assembly recipes
- "junk" -> "salvage"
2021-07-12 20:02:47 +02:00
reidbhuntley
cb41ac679d Use custom FakePlayer for converting Zombie Villagers 2021-07-12 00:43:23 -04:00
reidbhuntley
b70608b030 Yet further finely-tuned
- Fixed blocks not updating their neighbors when being assembled into a contraption
- Fixed Stockpile Switch not updating its redstone output when its signal is inverted
- Reduced lag caused by many active nearby soul particles
- The Wither's shield is now immune to potato projectiles
- Fixed potato projectile potion effect weirdness
- Golden Apple potato projectiles can now cure Zombie Villagers
- Potato Recovery will no longer drop Golden Apples that successfully hit an entity
2021-07-11 21:25:41 -04:00
zelophed
4306d076db slow and steady
- add create's panorama as a background for config ui when opened from the main menu
- fix panoramas moving at a inconsistent speed

- add a optional speed limit to physical floats
2021-07-11 21:09:23 +02:00
PepperBell
e3386c178a Minor SBB clean up
- Allow custom light from dual (utility) light method to be applied
- Reorganize and rename some members
2021-07-10 22:39:42 -07:00
reidbhuntley
3ab3bffac3 Bump StressConfigDefaults version number
- Should fix Mechanical Arm stress usage staying at the old value in worlds created in previous Create versions
2021-07-10 23:30:27 -04:00
reidbhuntley
da9c306ed5 Lectern Controller edge cases
- When a Lectern Controller that a player is using is broken, they are no longer prevented from using any other Lectern Controllers
- Fixed weirdness when activating a Lectern Controller while holding another Linked Controller
2021-07-10 21:52:26 -04:00
simibubi
4a57b916ff Top ten hotswap engineering oversights
- Fixed reversed frequency display of Redstone Links
2021-07-11 01:28:28 +02:00
simibubi
2821fd7135 Lamptank
- Fixed custom rendered models rendering full bright when supposed to render full dark
2021-07-11 01:14:38 +02:00
reidbhuntley
f726477c8a make unenchanted potato cannons actually do damage (oops) 2021-07-10 18:26:21 -04:00
Jozufozu
f1da8b8f1e Cull code to fix crash on mac
- A bunch of dead code removal
2021-07-10 15:20:34 -07:00
282a9a6f3a Fix valve handles not having a tooltip 2021-07-10 18:46:44 +02:00
f9a40e2f06 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-10 10:55:01 +02:00
976d53c9e4 Adjustable repeater, Pulse repeater, Powered latch and toggle latch can now power comparators from the side, like vanilla repeaters already can 2021-07-10 10:54:54 +02:00
reidbhuntley
bc456a76cd Tuber Tube Tidy-up
- Set recovery chance for unenchanted Potato Cannons to 0
- Power enchantment on Potato Cannons now scales the damage of the projectile type instead of adding to it
- Changed Potato Cannon crafting recipe to better fit the new model
2021-07-09 23:11:16 -04:00
simibubi
802f8337fb Tweak projectile spawn location 2021-07-10 04:10:47 +02:00
1f4b8d3303 Merge https://github.com/kotakotik22/Create into mc1.16/dev 2021-07-09 23:52:58 +02:00
LordGrimmauld
95ad754654
Merge pull request #1908 from Carbon5/mc1.16/dev
Superglue follows mobGriefing gamerule
2021-07-09 23:45:47 +02:00
simibubi
30ba34dbb0 Behind the flaps
- Brass tunnels now show a goggle tooltip of contained items within their group
- Right-clicking brass tunnels now retrieves all contained items from their group
2021-07-09 23:43:11 +02:00
e56da570e8 Limit the light 2021-07-09 23:38:28 +02:00
Jozufozu
2eb9c7b6eb PartialModel gets called from the right place 2021-07-09 13:39:56 -07:00
simibubi
352f213429 Buffing the Buffers
- Fixed large amounts of output in crushing wheels getting voided due to its buffer capacity
- Fixed basin processing running constant recipe lookups while backed up #1911
- Fixed mixer retracting after every operation when auto-output is active
2021-07-09 19:27:50 +02:00
kotakotik22
e5eca1ed36 Arm interaction point utilities for addons 2021-07-09 18:45:50 +02:00
PepperBell
7ed7b957dd Flaming souls
- Add soul flame type to lit blaze burner
- Tweak empty blaze burner ponder to show how to transform flame
2021-07-09 00:28:21 -07:00
PepperBell
f90dd34f5b Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev 2021-07-08 23:22:36 -07:00
PepperBell
bdbd5c9533 Remote extinguishing
- Make splash water bottles extinguish lit blaze burners
2021-07-08 23:21:51 -07:00
Carbon5
63bd4258e1 Superglue follows mobGriefing gamerule 2021-07-08 20:52:39 -04:00
Jozufozu
51ebf2baec Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-08 13:26:13 -07:00
Jozufozu
a800cbea05 Fix funny glue textures 2021-07-08 13:25:35 -07:00
PepperBell
cf3ef8c229 Fix saw blade culling
- Remove AllColorHandlers as it was empty
- Organize imports
2021-07-08 11:17:35 -07:00
simibubi
5a031bb99d CrushCrushCrush
- Added some rudimentary crushing ambience
- Dyed nixie tubes now return the correct item for Pickblock and Schematicannons
2021-07-08 16:22:59 +02:00
801f5fa130 Filter for shulker fill level 2021-07-08 09:45:53 +02:00
simibubi
d418f06f37 Magitank
- Copper Backtanks can now be enchanted
- Added the Capacity Enchantment
2021-07-08 00:03:58 +02:00
simibubi
83a3faa871 Mortal Compat
- Commented a teleport hook not yet included in recommended forge
2021-07-07 22:05:09 +02:00
simibubi
10b0bdbfcf Range indication for bells
- Stationary Haunted Bells now show particles at the perimeter of the scanned area, regardless of light level
2021-07-07 19:38:32 +02:00
simibubi
efa2bc745f Magic Potatoes
- Fixed localization of potato cannon ammo tooltip
- Added several enchantment compatibilities to the Potato Cannon
- Added the Potato Recovery Enchantment
2021-07-07 17:33:43 +02:00
reidbhuntley
48ea7d64b4 Classic funny
- When a Cake or Pie projectile launched from a Potato Cannon hits a mob, it will slide down the side of the target
2021-07-06 21:22:52 -04:00
simibubi
0fb5556960 And the hunt continues...
- Fixed kinetic stress loop caused by neighbouring belts
- Fixed kinetic stress loop caused by activating ejectors
- Fixed recipe book logspam regarding seq. assembly recipes
2021-07-06 21:26:40 +02:00
simibubi
61279a4c22 Merge branch 'mc1.16/dyeable_nixies' into mc1.16/dev 2021-07-06 18:36:15 +02:00
simibubi
905b140a2f Dyeable Nixies, Part II
- Ponder doc
- Fixed a few colours
- Fixed text wipe on colour change
- Fixed pick block
- Nixie Tubes can now be picked up using the Wrench
2021-07-06 18:35:41 +02:00
simibubi
6eb54267f3 Bell Voxelshapes 2021-07-06 17:03:31 +02:00
simibubi
8f234b7fa8 Dyeable Nixies, Part I 2021-07-06 15:04:22 +02:00
simibubi
66086f6675 Facing down
- Ensured players really want to place a water wheel vertically
2021-07-06 13:25:25 +02:00
b13ba431fb This change does not have to be here 2021-07-06 10:40:10 +02:00
b2e3fe6fd1 get horizontal water wheels ready for 1.16 2021-07-06 10:25:00 +02:00
f4d73118b1 merge more of the new stuff 2021-07-06 10:05:26 +02:00
simibubi
5becf40b60
Merge pull request #1895 from kotakotik22/mc1.16/dev
changes to make it easier for addons
2021-07-06 02:58:00 +02:00
simibubi
b87e707b49 Bell Voxelshapes 2021-07-06 01:16:44 +02:00
simibubi
0b40a57227 Instant Spook
- Clockwork Component -> Precision Mechanism
- Re-organized bell models
- Added a little warm-up timer for held haunted bells
- Tweaks to all Sequenced assembly recipes
- Fixed missing particle of incomplete cogwheels
- Sequenced Assembly mid-products are no longer stackable
2021-07-06 00:54:24 +02:00
kotakotik22
e4e53f8c1b Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-07-05 18:35:32 +02:00
kotakotik22
159f96ca57 Processing recipe generation addon utilities 2021-07-05 18:30:23 +02:00
reidbhuntley
8abdbb68f2 Lectern controller keepalive fix 2021-07-05 12:08:43 -04:00
reidbhuntley
4801c6f73b Revert "Top-up"
This reverts commit 1a273753
2021-07-05 11:32:57 -04:00
kotakotik22
b0d4376730 Make shape builder public 2021-07-05 16:22:55 +02:00
Jozufozu
d4a4e245bd Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2021-07-04 23:54:34 -07:00
Jozufozu
92bf76761e Assembling cogs
- Cogwheels and Large Cogwheels can now be created via sequenced assembly
   - Higher return at lower cost
   - Might want to nerf?
 - Add placement helper for Deployers on belts/depots/etc.
 - Multiple SequencedAssemblyRecipes can now start with the same item
2021-07-04 23:50:52 -07:00
reidbhuntley
e561ac8e73 Immersive pumpkin chuckin'
- Block items shot by the Potato Cannon now spawn a FallingBlock entity when they hit the side of a block
2021-07-04 23:34:04 -04:00
reidbhuntley
1a273753eb Top-up
- Copper Backtank now recharges the durability of pneumatic tools in the wearer's inventory rather than being used as a separate durability source
- Potato Cannon and Extendo Grip now become inactive instead of breaking when running out of durability
2021-07-04 21:56:18 -04:00
reidbhuntley
202f81aa7c The Polishing
- Added new Potato Cannon projectile types and tweaked values of existing types
- Potato projectiles can now catch fire and ignite entities like arrows
- Made splitting potato projectiles more consistent
- Lectern Controller can now be pick-blocked in creative and be placed by Schematicannon
- Fixed Schematicannon treating schematics with a single block in them as empty
- Soul base particles now also disappear early if their location gets lit
- Renamed Cursed Bell to Haunted Bell
2021-07-04 14:23:34 -04:00
vemerion
6e0a758d1f Change to use Forge milk
This commit removes Create's fluid milk, and changes things to instead
use the milk fluid already provided by Forge. This makes the mod more
compatible with other mods. I also added an event subscriber to the
MissingMappings event in the AllFluids class, to convert already
existing Create milk to Forge milk so that players don't lose any stored
milk.

Note: I did not update language files and remove textures to reflect the
fact that Create's milk to longer existsMissingMappings, so right now
there are some unused resources that can be cleaned up.
2021-07-04 20:09:43 +02:00
simibubi
5179aad4fe Tweaks
- Added config control for ambient sounds
- Spilled milk off a pipe end now clears effects on entities
- Non-placeable fluids now exit an open pipe at a fixed rate of 1mb/t
- Air currents can now pass through Campfires vertically
- Fixed perpendicular movement actors not activating consistently
2021-07-04 16:30:46 +02:00
Jozsef
da5aefe588 Steady hands
- Linked controller animates smoothly when you activate it
2021-07-04 00:56:57 -07:00
Jozsef
de339819d5 Wrench-stone
- Wrenches can pick up redstone components
 - This behavior is controlled by the block tag #create:wrench_pickup
2021-07-04 00:42:10 -07:00
simibubi
8fd4664ed8 Ploughing bubbles
- Fixed Mechanical Plough breaking segments of a bubble column
2021-07-03 16:38:51 +02:00
simibubi
1b5f9e7944 Picking up Controller Rails
- Controller Rails can now be picked up using a Wrench
2021-07-03 16:30:37 +02:00
simibubi
b2ff3a465f Advancing via Potato
- Added an advancement for the potato cannon
- Fixed the clockwork advancement
- Fixed the press advancement not firing when used with depot
2021-07-03 16:09:07 +02:00
simibubi
8a598a699b Ender Chutes are real
- Fixed chutes directly between two inventories transferring items instantly
- Fixed jittering visuals of the clientside chute item near containers
- Rail blocks can now be picked up with a wrench
2021-07-03 15:37:07 +02:00
PepperBell
7264d838a0 Remove another unnecessary override
- Remove shouldCloseOnEsc override from AbstractSimiContainerScreen
2021-07-03 01:15:34 -07:00
PepperCode1
215262bbe5
Merge pull request #1873 from macbrayne/patch-1
Fix #1872 by removing a unnecessary override
2021-07-03 01:10:58 -07:00
PepperBell
b5c0684dd6 Rendering refactors
- Fix fluid rendering in JEI scenes
- Add more separate options to SuperByteBuffer
- Fix copper backtank diffuse when worn
- Fix enchantment glint on custom rendered items; Closes #1846
2021-07-03 01:03:37 -07:00
simibubi
ccbb57f518 Tiny padding tweak 2021-07-02 13:06:28 +02:00
zelophed
8550b07011 confirm again
- fix confirmation screen not rendering its stencil elements corectly
- add a title with the current modId to config base screen
2021-07-02 12:56:58 +02:00
simibubi
c6fa055d9b The one in orange
- Blueprint overlay now renders a '1' for single missing items
- Dough can now be created in the mixer without the need of buckets
- JEI no longer shows all available machines as catalysts for sequenced assembly recipes
2021-07-02 12:52:52 +02:00
simibubi
b5ff93cff0 You saw nothing
- Tweaked item processing behaviour of mechanical saws
- Fixed placement assist not playing placement sounds
- Saws now yield more planks
- Saws can no longer process stacks of items, unless configured to
- Removed unused sounds
- Soul particles now disappear early if their location gets lit
- Stationary cursed bell range is doubled
- Mechanical Arms now require clockwork components to craft
- Extendo-grips now require clockwork components to craft
- Mechanical Arms now take significantly less stress units to power
- Added recipe for the potato cannon
- Bells no longer require ghast tears
2021-06-30 16:55:24 +02:00
reidbhuntley
7df865b3cb No longer just for books
- Allow Linked Controllers to be placed onto and used from Lecterns
- Set Linked Controller max stack size to 1
2021-06-29 22:33:44 -04:00
simibubi
7548d483fd Dist patch? 2021-06-29 23:00:27 +02:00
simibubi
c6e50ad26e Dist patch 2021-06-29 22:28:14 +02:00
6990f6d60e Finally find the 1.16 equivalent to not calculate water pushing on contraptions (performance impact = huge) 2021-06-29 21:21:50 +02:00
macbrayne
e25a016596
Fix #1872 by removing a unnecessary override
The parent class uses the exact same code to stop the screen from pausing. AFAIK it shouldn't break anything.
2021-06-29 12:27:11 +02:00
PepperBell
3d825fe632 Ender potatoes
- Add chorus fruit as potato cannon ammo
2021-06-28 15:03:14 -07:00
simibubi
94e4f56fe1 Just enough assembly lines
- Added JEI integration to Sequenced Assembly
- Bit of Refactoring
- The amount of steps before the transformation occurs are no longer random
- Intermediate item now shows assembly progress in its tooltip
2021-06-28 17:02:57 +02:00
PepperBell
7b18c658b7 Polished bells
- Fix cursed bells not rendering on contraptions
- Prevent players in spectator from creating soul pulses
- Improve and format some bell-related code
2021-06-27 23:15:51 -07:00
reidbhuntley
9d5eecff06 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-28 00:20:47 -04:00
reidbhuntley
6cf80c60de NPE 2021-06-28 00:20:19 -04:00
simibubi
2cfb84995f Recipes in Recipe Recipes
- Added the Clockwork Element
- Added the Sequenced Assembly recipe type (needs JEI)
- Added cascaded datagen for assembly sequence and each of its available processing types
- Temporary test recipe
- Added support for Sequenced Assembly to Press, Deployer, Spout and Saw
- Removed Integrated Circuits
- Removed Lapis sheets
2021-06-28 04:00:24 +02:00
reidbhuntley
d0be7428aa Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/BellRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java
#	src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java
2021-06-27 21:46:51 -04:00
reidbhuntley
82d4a8772d Curses III, extra spooky edition
- Added proper rendering, tooltips, sounds, and particle effects to the bells
- Added a crafting recipe for the Peculiar Bell
- Added a conversion method for obtaining Cursed Bells
- Fixed the soul indicators showing up in non-full blocks
2021-06-27 21:38:42 -04:00
PepperBell
4bf61e049d Organize imports 2021-06-27 11:03:21 -07:00
reidbhuntley
53383dc6a2 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-27 11:47:15 -04:00
reidbhuntley
a8aa0beed9 Curses II
- Added (temporary) rendering to the bells
- Create soul pulse effects on players holding the Cursed Bell item
2021-06-27 11:46:56 -04:00
PepperBell
31bd6865fc Custom lighting refactor and JEI tweaks
- Create ILightingSettings and CustomLightingSettings to better manage
custom lighting
- Allow item GuiGameElements to have custom lighting
- Add defaultBlockElement methods to automatically apply default custom
lighting to JEI scenes
- Add blaze head bobbing to JEI scenes
- Shift elements on JEI washing scene
- Use an empty screen instead of creating a new one in IScreenRenderable
2021-06-26 23:46:10 -07:00
simibubi
e61dd71df1 No turning back now
- Cart Assemblers now have a specific direction
- Assembled cart contraptions assemble and disassemble according to the assemblers direction
- Cart contraptions no longer turn exponentially
- Cart contraption now turn more sluggishly the larger they are
- Some changes to the cart assembler model
2021-06-27 01:42:35 +02:00
JozsefA
80f38ef05f Soul animation stages
- Kinda cursed state machine but it works, good start for future iteration
 - Adjust the timings
2021-06-26 15:20:09 -07:00
JozsefA
45fe9ba61c Break up the monotony, suffer a little longer
- Soul particles last longer and loop
 - Randomly mirror the particles
2021-06-26 11:52:28 -07:00
JozsefA
5a7a35b3cc Sounds in the right places and no stacking 2021-06-26 10:40:10 -07:00
f4b16852af Merge all the new stuff 2021-06-26 19:24:59 +02:00
9763631984 Fix up the dynamic trees 2021-06-26 19:13:44 +02:00
reidbhuntley
9ddc520652 Curses
- Added the Peculiar Bell and the Cursed Bell
2021-06-26 12:05:38 -04:00
simibubi
fbcaa1b931 Fwoomp of Duty: Black Crops 4
- Introduced proper first-person rendering of Potato Cannons, inherited from blockzappers
- Introduced proper dual wield handling for Potato Cannons
- Potato cannons are no longer stackable
- Added a couple more attributes to ammo types
- potatoes and carrots now plant a crop when hitting farmland
- Added a couple particle effects
- Fwoomp sound now slightly randomizes its pitch
2021-06-26 16:32:56 +02:00
simibubi
6feacd3fc2 Fix cart contraption pickup 2021-06-26 12:28:03 +02:00
PepperBell
737b7ad255 Extra recipes
- Add chocolate melting, honey liquification, and honey compacting
recipes
- Create honey tag field and use Forge's milk tag field
- Make fluid fields final
- Closes #1845
2021-06-26 00:30:01 -07:00
PepperBell
de929ef510 GUI cleanup and fixes part 2
- Change positions of more GUI elements
- Fix mistakes from last cleanup
- Add window offset to AbstractSimiScreen
- Implement container usability check properly and add
IInteractionChecker
- Render schematic and quill in schematic prompt screen
- Rename curiosities2.png to curiosities_2.png
- Various other tweaks, fixes, and improvements
- Resolves #1847
2021-06-25 22:16:17 -07:00
simibubi
5a30c3bcdb Vegetable accelerator
- Added the Potato Cannon
- Extendogrips now have durability, which is not consumed while wearing a copper backtank (same applies for potato cannon)
- Added a few projectile types for testing
2021-06-26 01:17:35 +02:00
simibubi
ef74d9eef9 Ponder à la carte
- An overview of Ponder Tags can now be opened from the game menu
2021-06-25 00:55:40 +02:00
simibubi
12085ed909 Merge branch 'mc1.16/fluid-ponder' into mc1.16/dev 2021-06-24 23:38:56 +02:00
PepperBell
ce332bfe40 Fix config comment dividers
New Forge versions replace empty comments with "No comment", so the
divider comment was changed from "" to " ".
2021-06-24 14:28:40 -07:00
simibubi
40cbbf2b29 Thinking beyond Pipes
- Pondering for Spouts, Item Drains and Portable Fluid Interfaces
- Removed tooltips for fluid components
2021-06-24 22:37:30 +02:00
simibubi
ab8b8e41da Thinking about Pipes
- Survival mode players can now configure the fluid supplied by a creative fluid tank
- Pondering for Tanks, Creative Tanks and Hose Pulleys
2021-06-24 18:22:28 +02:00
simibubi
9a020dd02a Thinking via Pipes
- Pondering for Pumps, Smart Pipes, Valves
2021-06-24 11:49:46 +02:00
JozsefA
0c5fb3de3e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-24 01:21:45 -07:00
JozsefA
abf8bc8a4e Fix crash on resource reload
- Invalidate contraption renderers on context gathering
2021-06-24 01:21:33 -07:00
PepperBell
178af2061f Fix harvester culling
- Make harvester's render box a unit cube
- Expose manually animated speed through getter
2021-06-23 23:05:31 -07:00
PepperBell
8d90137b1a Remove TooltipHelper.getUnformattedDeepText
- Replace it with ITextComponent.getString
2021-06-23 22:32:42 -07:00
JozsefA
3ce4e2c5e8 Cleanup flywheel event listeners, fix crash on server startup 2021-06-23 13:19:03 -07:00
PepperBell
0bc1a71558 Crash-proof nixie tubes
- Add many checks when reading NBT to prevent crashes
- Store rendered strings and only update when necessary
- Reorganize some code and rename some members
2021-06-23 12:34:12 -07:00
JozsefA
d189efd987 Whoops missed some classes 2021-06-23 00:16:24 -07:00
JozsefA
312b327161 Fix fluid rendering bug
- ContraptionRenderDispatcher wasn't cleaning up its state, so fluids were being drawn with the wrong shader program
2021-06-23 00:01:19 -07:00
JozsefA
64c55c1205 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	README.md
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pl_pl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
2021-06-22 21:13:34 -07:00
JozsefA
dd63c6c4e3 Cleanup and get ready to merge 2021-06-22 21:09:32 -07:00
e4a340deef Maybe fix NPE in basin tile entity. Probably should check more thoroughly, but this should patch it for now 2021-06-22 20:58:23 +02:00
simibubi
0a376b719e Thinking with Pipes
- Implemented ponder scenes for Fluid Pipes and Copper Casing
- Adjusted Fluid transfer, containment and rendering behaviours to function in 'virtual' environments
2021-06-21 18:46:31 +02:00
reidbhuntley
813a1ccaba Prevent Belts under Tunnels from picking up item entities 2021-06-20 15:00:31 -04:00
reidbhuntley
ba0e851487 Fix inconsistency with Deployers on contraptions
- Previously Deployers would sometimes collide with the contraption entity they were a part of and their activation would be consumed
2021-06-20 11:07:27 -04:00
reidbhuntley
e71d03c375 Fix Deployer inventory-voiding bug
- Deployers' inventories will no longer be voided when their contraption is disassembled and reassembled before the DeployerTileEntity can initialize
2021-06-20 01:55:08 -04:00
JozsefA
aeff644cc3 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.json
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pl_pl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
#	src/main/java/com/simibubi/create/AllContainerTypes.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintEntity.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintOverlayRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java
#	src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintScreen.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmRenderer.java
#	src/main/java/com/simibubi/create/content/logistics/item/LinkedControllerScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/FilterContainer.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java
#	src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllGuiTextures.java
#	src/main/java/com/simibubi/create/foundation/gui/mainMenu/CreateMainMenuScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/ChainDriveScenes.java
#	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/assets/create/lang/default/messages.json
#	src/main/resources/assets/create/lang/default/tooltips.json
2021-06-19 16:11:18 -07:00
PepperCode1
1459be7926
Merge pull request #1565 from MarioSMB/mc1.16/dev
Various recipe fixes and adjustments to improve mod compatibility
2021-06-19 12:37:24 -07:00
JozsefA
652111c233 Yeet 2021-06-19 00:29:18 -07:00
reidbhuntley
cded120a0c Write NBT 2021-06-18 21:37:17 -04:00
reidbhuntley
e0941d7ba2
Merge pull request #1781 from AtlaStar/mc1.16/issue-1779-fix
Make Basin spouts properly empty into paired Funnels
2021-06-18 21:25:12 -04:00
reidbhuntley
f8111205b3 Temporary turnaround
- Fixed Minecart Contraption Item's initial orientation being incorrect inconsistent in certain situations
2021-06-18 20:44:15 -04:00
reidbhuntley
ecfa554c05 Spawn control
- Cart Contraptions with attached Spawners can no longer be picked up with a wrench (configurable)
2021-06-18 17:34:39 -04:00
simibubi
bc2b5169c8 The forgotten Keyframes
- Added Keyframes to scenes created before the feature existed
2021-06-18 22:13:34 +02:00
simibubi
91bc678ab4 Finding bugs explaining things
- The portable fluid interface now waits until extracting pipes have completed their flow before disengaging
2021-06-18 18:48:12 +02:00
simibubi
1bab1bc6d3 Ponder prep, Part II
- Added scene for deployer's new item processing
- Fixed particles rendering faced away from the camera
- Fixed airflow particles not getting lit properly
- Fixed lack of culling in Gui ItemStack elements
- Prepared texts for all fluid-related storyboards
- Fixed ponder progress bar not displaying
2021-06-18 18:13:40 +02:00
simibubi
c23071863d Ponder prep
- Added tooltips for newly added tools and equipment
- Fixed depth issues in Ponder UI
- Fixed lack of backface culling in ponder
- Added placeholder storyboards for missing ponder scenes
- Fixed menu screen cogs rendering behind the background
- Fixed menu screen not pausing the game
2021-06-18 12:45:43 +02:00
PepperBell
a15c9b0ad5 Fix errors from last commit
- Create method overload in SchematicItem to solve errors
- Organize imports and do formatting in schematic related classes
2021-06-17 20:32:52 -07:00
reidbhuntley
96e865be02 Schematic insta-placement now uses Schematicannon logic 2021-06-17 22:47:38 -04:00
PepperBell
e55ae22d7d Fix fluid tank render boxes
- Update render box on client TE initialization and update packet
- Resolves #1669
2021-06-17 14:43:40 -07:00
c1d88bbad4 Shut up non_movable. Please. 2021-06-17 22:27:48 +02:00
a6f0816611 No longer move obsidian by contraption (Stoopid datagen), this time for real 2021-06-17 21:55:13 +02:00
simibubi
57f6e739e3 Return of the buttons
- Added recipe for linked controller
- Removed soundspam of saws, needs continuous replacement
- Soundscapes are now reset on resource reload
2021-06-17 16:20:15 +02:00
0a0acb3d4c Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-06-17 14:01:27 +02:00
084d240f05 Fix #1801 2021-06-17 14:01:20 +02:00
simibubi
4265a2855c Finally bearable
- Entities can now jump on Mechanical Belts
- Entities on belts no longer get force-centered while actively moving or strafing
2021-06-17 11:28:29 +02:00
PepperBell
1d476160cc Mechanical arm tweaks
- Don't dance if arm speed is zero
- Rerender arm after switching back from dancing state (flywheel only)
- Formatting
2021-06-16 17:17:16 -07:00
simibubi
06ca8b0d1c What's inside?
- Blueprint crafting overlay now attempts to show a list of items matching an ingredient filter in the respective slot
- Fixed JEI prematurely transferring the blueprint recipe when viewed
2021-06-17 00:54:48 +02:00
simibubi
bf1c86ed87 Flow transfer
- Fluid pipes no longer reset their contained flows when changed to/from their windowed or encased variant
2021-06-16 22:32:58 +02:00
simibubi
ee3d359a9a Reorder main menu 2021-06-16 21:58:46 +02:00
simibubi
158c0eba15 Blending in with Entities
- Changed blueprint entity and item rendering to be more Optifine friendly (?)
- Punching blueprints now clears the slot before breaking it
- Fix a dist issue with KTEs
- Added recipe for blueprint
2021-06-16 21:39:38 +02:00
simibubi
788a00efdf Breaks in every port
- Fixed the schematic hotbar overlay
- Goggles overlay is no longer its own eventhandler
2021-06-16 17:17:55 +02:00
reidbhuntley
785242d5b3 Fix registry crash induced by AbnormalsCore 3.2.0 2021-06-15 00:57:29 -04:00
reidbhuntley
550b456396 Ejectors placed by Schematicannon keep their targets 2021-06-14 22:29:29 -04:00
reidbhuntley
d94a7faaa5 Tweaks n' configs
- Fixed ejectors stacking unstackable items
- Tweaked infinite fluid source size configuration
- Fixed a Schematicannon crash my code from a previous commit caused
- Added config for disabling large Firework Rocket recipes
- Added config for disabling movable Spawners
2021-06-14 22:03:06 -04:00
HebaruSan
18af709c9b
Scale hose pulley timer with server's infinite block threshold (#1752)
Thanks for the detailed writeup!
2021-06-14 18:02:47 -04:00
PepperBell
ec2a66357f Linked controller spectator fixes
- Deactivate controller if in spectator mode
- Prevent packet handling if in spectator mode, except for resets
- Deactivate controller if a screen is opened
- Resolves #1774
2021-06-13 11:22:42 -07:00
D Melton
673fc3cd8e Make Basin interaction with Funnels work
Allows Basins to interact with downward facing Funnels located at an offset below and to the side. Previously would show a connection between basin and funnel but would not interact with them.
2021-06-13 09:53:05 -07:00
PepperBell
2a19b5eb41 GUI cleanup and fixes
- Change positions of GUI elements to improve the overall experience
- Fix window and extra areas to be perfectly aligned with drawn textures
- Add SlotMovers to new screens
- Fix schematicannon progress bar; Resolves #1674
- Fix black background in curiosities2.png
- Move all title creation to getDisplayName
- Other minor tweaks
2021-06-12 21:16:16 -07:00
JozsefA
d612cfdd34 Merge remote-tracking branch 'origin/mc1.16/dev' into chromatic-projector 2021-06-11 10:31:18 -07:00
JozsefA
c1dadf3860 Instance managers are abstract 2021-06-10 14:34:16 -07:00
reidbhuntley
5bd0c73f45 Flipping pipes
- Pipes not connected to anything will no longer change direction when a non-connective block is placed next to them
2021-06-10 17:12:45 -04:00
simibubi
1b5ede1a5d main menu title
- Added new logo to the Create menu screen
2021-06-10 20:32:17 +02:00
simibubi
1f48c698e8 ITE refactor 2021-06-09 23:48:34 +02:00
simibubi
2852756a68 Deny ProcessingInventories from Mounted Storage 2021-06-09 17:16:10 +02:00
simibubi
971ce29b6a Skip.
- Config UI automatically skips to the layer of config where multiple options are available
- Removed range tooltips
- Config entries in UI list are now sorted by name, with config groups at priority
2021-06-09 16:53:54 +02:00
simibubi
169669680b Colour shift
- Switched to a more readable text colour for the config ui
- Slight tweaks to ponder button colours as well
- Replaced discord link with project page
2021-06-09 16:17:29 +02:00
simibubi
7fae3e4968 Promp
- Changed the layout of save/discard/leave prompts
- Leaving with unsaved changes now gives you the option to save
- Config tooltips now use standard Create tooltip splitting
2021-06-09 13:52:52 +02:00
JozsefA
b4a1fbf2c7 Instanced entities are lit 2021-06-09 00:26:54 -07:00
reidbhuntley
911aec5a3f Gave stockpile switch output a delay (like comparators have) to improve stability 2021-06-08 22:06:34 -04:00
simibubi
212cd593a7 Create menu, Part I
- Added an intermediate menu screen for in-game links and configs
- Couple slight tweaks to config UI
2021-06-09 02:17:32 +02:00
JozsefA
1ce141850b Merge remote-tracking branch 'origin/chromatic-projector' into mc1.16/chromatic-projector 2021-06-07 18:24:25 -07:00
JozsefA
9cc03a81d7 Instanced entities stage 1 2021-06-07 18:12:46 -07:00
PepperCode1
3c84087f15 Fix saw and PSI diffuse
- Fix saw and portable storage/fluid interface diffuse lighting
- Remove "disableDiffuseTransform" option from SuperByteBuffer
- Switch argument order in RenderedContraption constructor to be consistent with superclass (ContraptionWorldHolder)
2021-06-07 16:14:51 -07:00
JozsefA
285b8f98cf Instanced entities stage 0 2021-06-07 02:43:36 -07:00
JozsefA
d47f898c76 Move away from a static backend class, add a registration event 2021-06-06 15:46:16 -07:00
reidbhuntley
12bfc78443 Bundle o' bugfixes
- Fix Extendo Grip not applying extended reach when equipped on rejoin
- Fix mechanical crafters duping + dropping their items when added to minecart contraption
- Fix Wand of Symmetry duping rails under placed cart assemblers
- Lecterns now keep NBT when moved by contraption
- Super glue entities hanging on positions above build limit now get removed
- Fix harvester replanting sweet berry bushes in wrong state
- Cuckoo clock and clockwork bearing now go crazy in unnatural dimensions
2021-06-06 16:59:15 -04:00
reidbhuntley
c97da3868f Prevent AgriCraft/InfinityLib crash 2021-06-05 16:14:16 -04:00
PepperBell
823520e047 Improve handling of dyed blocks
- Create DyedBlockList for storing and accessing a set of dyed blocks
- Switch usage of BlockEntry<?>[] to DyedBlockList in AllBlocks
- These changes also finally fix the compilation error related to generic arrays
2021-06-05 10:43:16 -07:00
reidbhuntley
fec329e3d2 Make deployer check for consumed actions too 2021-06-05 12:29:56 -04:00
reidbhuntley
dff459a75f Fix bad behavior with small-max-stack-sized items when extracting multiple items at once 2021-06-05 12:29:56 -04:00
PepperBell
16cf6a44de Fix ponder typo
- Fix "exacly" typo in adjustable chain gearshift ponder scene
- Resolves #1718
2021-06-04 21:53:04 -07:00
PepperBell
2bada365b3 Registrate colors and organized item rendering
- Use Registrate's block and item color registration instead of running
the events manually
- Move utility color handler methods to foundation.utility
- Move all item rendering classes to foundation.item.render
- Move IBlockVertexColor from foundation.block to
foundation.block.render
- Remove unnecessary raw cast in CreateRegistrate
2021-06-04 21:26:25 -07:00
JozsefA
457fff78f3 Mostly untangle the loading functions, enforce triangles 2021-06-04 17:55:05 -07:00
JozsefA
9bac709dfd Event system, sort of untangle backend 2021-06-04 15:56:46 -07:00
JozsefA
bef6d77a59 Start working on instanced enti- oh wait I've got to do all this other stuff first
- Separate model-level instance management from object-level instance management
 - Separate material management from rendering
 - A few things here and there related to entity instancing
 - Add a rudimentary command to spawn superglue
2021-06-03 21:23:06 -07:00
simibubi
032fa90ec6 Click to Craft
- Added Crafting Blueprints
- Bit of "Ghost-item" Container refactoring
2021-06-03 01:03:43 +02:00
JozsefA
d7ed765dde Debug text 2021-06-01 13:47:38 -07:00
JozsefA
59dd21b85a Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/AllContainerTypes.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java
2021-06-01 11:47:15 -07:00
JozsefA
c4b828ba56 Allocate no more than 3 quad->triangle EBOs ever. 2021-05-31 14:58:49 -07:00
simibubi
8fe3901c98 Remove leftover debug call 2021-05-31 22:48:45 +02:00
JozsefA
a526156440 Move a package 2021-05-31 12:51:11 -07:00
reidbhuntley
53ba59c082
Improve stability of sequenced gearshift (esp. for rotations) (#1695) 2021-05-31 15:42:12 -04:00
simibubi
a9ced3fea2 SoundScapes, Part IV
- Fixed diving helmet activating when wielder is only partially submerged in water
- Fixed diving helmet activating for players in creative mode
- Added sounds for the Mechanical Saw
- Added clicking sounds for the Linked Controller
- Gantry contraptions now make contraption noises
- Soundscapes now lower their volume based on the distance between listener and center of noise
2021-05-31 20:48:22 +02:00
simibubi
1532d9e4f6
Merge pull request #1684 from PepperCode1/mc1.16/cobblestone-drops
Cobblestone Drops and Smelting
2021-05-31 16:29:10 +02:00
simibubi
616a515939
Merge pull request #1680 from reidbhuntley/bugfix
More bug fixes
2021-05-31 16:25:37 +02:00
JozsefA
8fab6c4643 Instance triangles 2021-05-30 22:16:03 -07:00
JozsefA
3500b4ec87 Contraption triangles 2021-05-30 20:53:08 -07:00
JozsefA
2300ef2088 Organization, renaming, and fixing a dumb crash 2021-05-30 17:05:41 -07:00
reidbhuntley
a633bc47be Actually, we should prevent all updates caused by SchematicWorld 2021-05-30 14:36:06 -04:00
reidbhuntley
b890204f44 Fix schematic init crash caused by updating null ChunkSections 2021-05-30 01:40:24 -04:00
reidbhuntley
2bedc94bc6 Fix schematic deployment crash caused by some Mekanism blocks 2021-05-29 22:09:58 -04:00
PepperBell
c013345860 Cobblestone drops and smelting
- Make regular palette stone blocks drop their cobblestone variant instead of themselves (unless silk touch is used)
- Add smelting recipes for cobblestone palette blocks
- Rename PaletteBlockPatterns to PaletteBlockPattern
- Move PatternNameType to PaletteBlockPattern
- Rename some fields
2021-05-29 16:31:36 -07:00
reidbhuntley
51c0e347b8 Fix chest minecarts clearing their inventory when disassembled 2021-05-29 15:17:24 -04:00
PepperBell
9235aa93ba JEI Fixes
- Fix #1661: blasting-only recipes would not be shown under the bulk blasting category
- Add ability to remove matching recipes by type while using the category builder
- Fix fan catalyst items being italicized
- Add and tweak some visibility modifiers
2021-05-28 23:10:12 -07:00
reidbhuntley
55abcde5d5 Allow block breakers to work at center of bearing 2021-05-28 23:27:44 -04:00
reidbhuntley
0aaa09260b Fix minecart coupling item dupe 2021-05-28 14:42:47 -04:00
zelophed
5975a3cbac Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-05-28 14:42:39 +02:00
zelophed
975d898ac6 all the configs
- make it easier for addon devs to hook into create's config ui
- change the config command to allow for:
  - opening any mod's registered config
  - changing single values at a time

- possibly solve incompatibility with CalemiUtils mod and placement helpers
2021-05-28 14:42:27 +02:00
simibubi
ded259fbc9
Merge pull request #1662 from PepperCode1/mc1.16/piglin-compat
Add Piglin Compat
2021-05-27 14:29:41 +02:00
PepperBell
bcb365baa9 Fix processing for fireproof items with recipes
- Check for smelting and blasting recipes before checking for
fireproof-ness
2021-05-26 20:54:17 -07:00
PepperBell
773f74d33e Add piglin compat
- Fix #678 by adding golden sheets and crushed gold ore to the piglin_loved tag
2021-05-26 20:13:07 -07:00
PepperBell
462089b43a Clean up in world processing
- Use static RecipeWrapper for finding recipes instead of making a new TileEntity every time
- Move InWorldProcessing from logistics to contraptions/processing
- Fix #799 by disallowing blasting processing on fireproof items
2021-05-26 19:47:19 -07:00
simibubi
2e37807e7f
Merge pull request #1657 from reidbhuntley/config-button
Add button to open new config menu
2021-05-26 22:09:20 +02:00
simibubi
09691b4b40 Redstone gamepads
- Added the Linked Controller
2021-05-26 22:03:06 +02:00
reidbhuntley
73fd42baf5 Add button to open new config menu 2021-05-25 22:33:44 -04:00
JozsefA
de451553dd Use VAOs for contraption structures 2021-05-25 12:46:34 -07:00
JozsefA
7f9ff3b7ca Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-25 12:23:55 -07:00
simibubi
ffa252ac25 PR compat 2021-05-25 14:43:08 +02:00
simibubi
4d51e6096b
Merge pull request #1650 from PepperCode1/mc1.16/cleanup
Cleanup and Refactoring
2021-05-25 14:14:12 +02:00
JozsefA
c8814f123b More sane models
- BufferedModel is no longer abstract.
 - InstancedModel no longer inherits from BufferedModel, it accepts one as input.
 - Replace usage of IndexedModel with BufferedModel
2021-05-24 17:50:13 -07:00
PepperBell
d31fe013ce Fix dyed handle compilation error
- Revert DYED_VALVE_HANDLES to using an array instead of a Vector
2021-05-24 13:49:59 -07:00
PepperBell
20cd8da377 Allow registering custom block movement checks
Registering block movement checks works by using one of the six static register methods on an instance of an implementation of one of the six corresponding interfaces. Each one takes some arguments and returns a CheckResult, which defines whether to return from the global check or fall through to the next registered check or fallback check.

- Rename BlockMovementTraits to BlockMovementChecks
- Rename some check methods to be consistent
- Pass World instead of IBlockReader to isBlockAttachedTowards
- Make the bottom half of doors attach up and down
- Remove door check from Contrapion#moveBlock as it is unnecessary
2021-05-24 13:32:39 -07:00
reidbhuntley
3f31b765dd Make fan and nozzles not push players flying in creative 2021-05-24 15:19:54 -04:00
reidbhuntley
0cd49317d7 Revert "Make gantry carriage brittle"
This reverts commit bfc8c3e3
2021-05-23 22:42:03 -04:00
JozsefA
db53b7a3cf Fix gl error spam 2021-05-23 19:36:44 -07:00
JozsefA
341a385628 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/assets/create/lang/en_us.json
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/AllTileEntities.java
#	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
#	src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
#	src/main/resources/assets/create/textures/gui/icons.png
#	src/main/resources/create.mixins.json
2021-05-23 14:11:40 -07:00
reidbhuntley
eb075f683b Allow deployer to place cart assemblers 2021-05-23 16:40:15 -04:00
reidbhuntley
b0a84a9bc1 Fix breaking piston pole making piston base unusable 2021-05-23 15:08:43 -04:00
reidbhuntley
5ec8312322 Fix DoublePlantBlock dupe using deployers 2021-05-23 00:16:01 -04:00
reidbhuntley
73895604c8 Fix filter dupe, allow Schematicannon to place brackets 2021-05-22 21:50:31 -04:00
PepperBell
6c390977d8 Init Cleanup
- Refactor AllContainerTypes to use Registrate
- Replace RegistryEntry in AllEntityTypes and AllFluids with EntityEntry and FluidEntry, respectively
- Make AllEntityTypes use Registrate to register entity renderers instead of a separate method
- Refactor AllColorHandlers
- Fix error when a POI block is moved by a contraption
- Rename some static final fields to be upper snake case
- Make static fields in Create and CreateClient final
- Add I prefix to Coordinate interface
- Fix typo (BracketedTileEntityBehaviour#isBacketPresent)
- Make mixins go in alphabetical order
- Make pack.mcmeta use 2 spaces for indents
2021-05-22 18:00:10 -07:00
JozsefA
9352ef9ede Json program specs, new extension/gamestate system.
- Program specs are now loaded from json instead of being defined in code and registered manually.
 - Within the json spec, a program can define a list of states.
 - A state consists of:
   - A "when" clause.
   - A list of strings to be #defined.
   - A list of extensions to apply at program link time.
 - Each frame, the first state whose "when" clause returns true will be used.
 - A when clause consists of:
  - A state provider defined by a resource location.
  - A value to match.
 - When the value returned by the provider matches the value defined in the when clause, the when clause is considered to be 'true'.
 - There is syntactic sugar for when a provider returns a boolean value.
 - This system is in its infancy, and there is plenty of room for improvement.
2021-05-22 17:45:01 -07:00
reidbhuntley
bfc8c3e306 Make gantry carriage brittle, defer brittle blocks 2021-05-22 17:35:49 -04:00
simibubi
aea44aa3fb
Merge pull request #1613 from reidbhuntley/schematics-crash
Various bugfixes regarding schematics
2021-05-22 17:50:45 +02:00
reidbhuntley
c2cc124239 Better support for partially safe NBT writing 2021-05-21 20:33:28 -04:00
reidbhuntley
68b3ba7215 Allow Schematicannon to defer blocks to print at end 2021-05-21 16:57:01 -04:00
reidbhuntley
ff5984a48e Prevent rail fix from allowing floating rails 2021-05-21 13:38:13 -04:00
reidbhuntley
e1f1b1af9f Clean up gantry fix 2021-05-21 13:21:05 -04:00
reidbhuntley
c7d3166fd1 Clean up gantry fix 2021-05-21 13:18:15 -04:00
reidbhuntley
d0040260d7 Assemble gantry carriage when shaft is extended 2021-05-21 00:46:35 -04:00
reidbhuntley
305b16fea9 Store Schematicannon options in block item as NBT 2021-05-20 22:53:08 -04:00
JozsefA
d58897d59a Nothing in particular 2021-05-20 17:59:26 -07:00
reidbhuntley
badec3aad0 Add proper rotation and mirroring to CartAssemblerBlock 2021-05-20 16:31:04 -04:00
reidbhuntley
8edfa73352 Hack to prevent rails placed by cannon from updating 2021-05-20 13:50:42 -04:00
918c8082b1 clear unnecessary diffs 2021-05-20 08:45:17 +02:00
ad37c5d949 fix javadoc 2021-05-20 08:39:22 +02:00
7ae89ef4e3 Dynamic trees compat (WIP) 2021-05-20 08:31:35 +02:00
reidbhuntley
947496995a Make schematics write tags for filtering behaviour 2021-05-20 00:45:51 -04:00
JozsefA
9a178ef9d8 Abstract fog
- WorldPrograms no longer accept an explicit fog mode.
 - They now inherit from a class that takes a list of arbitrary shader extensions
2021-05-19 19:11:06 -07:00
JozsefA
4d755dc506 More simplification
- Move more stuff to the flywheel namespace
 - Give up on ShaderConstants, there's a better way to do it
 - A semblance of better crash reports
2021-05-19 16:35:37 -07:00
reidbhuntley
e916b06862 Added model data refresh mixin 2021-05-18 21:52:35 -04:00
PepperBell
480d86c5ad Fix beds on contraptions
- Add beds tag to brittle tag
- Let contraptions know bed halves are attached to each other
2021-05-18 18:50:54 -07:00
JozsefA
c299e84512 Be lazy grabbing instance fields statically 2021-05-18 14:41:16 -07:00
JozsefA
c48b94f0fb Merge remote-tracking branch 'origin/chromatic-projector' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java
2021-05-18 14:07:34 -07:00
JozsefA
55703d8838 Move to the template system and overhaul instance attributes
- All material shaders now use the template system.
 - Because of the template system, we can know what attributes a material has, along with how they're formatted.
 - All of the *Attribute enums are effectively inlined, as the context they used to provide is no longer needed.
2021-05-18 14:05:52 -07:00
PepperBell
18977da884 Minor fixes part 2 2021-05-17 12:07:45 -07:00
JozsefA
695fe98d28 MaterialSpecs choose their model formats 2021-05-16 20:37:26 -07:00
PepperBell
fd6c930a65 Merge remote-tracking branch 'upstream/chromatic-projector' into
contraption-lighting

# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java
#	src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
2021-05-16 19:12:14 -07:00
PepperBell
61b101f0c6 Refactor contraption matrices
- Create ContraptionMatrices class for better management of matrices during the contraption rendering process
- Fix diffuse lighting when rendering contraptions without Flywheel
- Clean up TileEntityRenderHelper
- Add disableDiffuseTransform to SuperByteBuffer and fix light calculation logic
2021-05-16 18:42:56 -07:00
JozsefA
6227e81066 TemplateBuffer is no more
- Instead, BufferBuilderReader can decode parts of a BufferBuilder.
 - BufferedModel and its subclasses are now created directly with a ByteBuffer.
 - ContraptionModel renamed to IndexedModel.
 - InstancedModel and IndexedModel both now take model formats as arguments.
 - All of this allows for better abstraction, composition, and control of models rendered with Flywheel.
2021-05-16 15:39:52 -07:00
JozsefA
9ff193946c Refactor InstancedModel to not rely on inheritance
- Instead, MaterialSpecs store the information
 - RenderMaterials are now generic on InstanceData instead of InstancedModel
 - RenderMaterials are directly constructed with and store a MaterialSpec
2021-05-15 16:41:56 -07:00
PepperBell
f33b08d996 Minor fixes
- Fix holder refresh
- Fix SuperByteBuffer light calculation
- Remove unused import
2021-05-15 12:15:06 -07:00
PepperBell
67052fd00c Add lighting to non-Flywheel contraptions
- Pass contraption world to movement behavior rendering
- Add hybrid lighting option to SuperByteBuffer (takes max of world light and vertex light)
- Create ContraptionWorldHolder for caching contraption worlds for contraptions that are not rendered with Flywheel
- Refactor some parts of contraption rendering
2021-05-15 00:21:20 -07:00
JozsefA
79977aee14 Choose between 2 different implementations of a mapped buffer
- MappedBufferRange (GL30) and MappedFullBuffer (GL15) so far
 - Persistent mapping (optionally?) would be nice
2021-05-14 22:51:14 -07:00
JozsefA
3856283353 Merge remote-tracking branch 'origin/chromatic-projector' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionModel.java
2021-05-14 18:07:13 -07:00
JozsefA
a9cdb1ab6b Begin buffer rework 2021-05-14 18:04:25 -07:00
PepperBell
dac9010f20 Optimize lighting checks
Also
- Set null layer after rendering contraption
2021-05-14 17:23:10 -07:00
PepperBell
6c1c7a10d9 Fix darker contraptions
Also
- Partially fix incorrect vertex lighting (make sure to not sure Forge's lighting calculator)
- Reorder some lighting to make it more efficient
- Cleanup some things
2021-05-14 16:34:35 -07:00
JozsefA
7abc860809 Fix fluid rendering in tanks and pipes on fabulous graphics 2021-05-13 11:37:04 -07:00
JozsefA
56b2046957 It can actually load and link something
- Lots of refactoring in the shader loading code.
 - Abstract all the different shader source transformations into ProcessingStage.
 - An ordered list of ProcessingStages is called a ShaderTransformer.
 - When you acquire sources, a Shader now keeps track of the source location, shader type, and source code all together.
2021-05-12 15:14:33 -07:00
JozsefA
c1b7a1c19d Extremely fancy shader templating
- Nothing is properly hooked up yet.
 - A single shader file will be able to be compiled with different opengl targets.
 - I plan on using this to implement meshlet rendering as an alternate backend-backend that will be used when available.
 - It could also be used to enable compatibility with opengl 3.0 or potentially even 2.0.
2021-05-11 18:24:12 -07:00
JozsefA
2c4d650639 Organize the mixins 2021-05-11 12:34:38 -07:00
JozsefA
916b187aa8 Better belt breaking 2021-05-11 11:39:13 -07:00
JozsefA
f6937ffb0c Only a few moves left
- flywheel stuff only barely depends on create
 - start drafting what multiple backends could look like
2021-05-11 11:02:43 -07:00
JozsefA
70401e4ac4 More tweaking
- FLWFinalizeColor takes care of assigning gl_FragColor
 - Multiply crumbling alpha with diffuse alpha
2021-05-08 23:29:02 -07:00
PepperBell
bc6a6a3c9b Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.16/fix-bugs 2021-05-08 20:56:21 -07:00
PepperBell
b10ceaf63d Improve normal scaling fix 2021-05-08 20:02:32 -07:00
simibubi
ca5b9b4fb9 Bugs and things
- Recipes for the diving gear
- Idle Windmill Bearings now attach their structure when moved as part of another contraption
- Fixed pumps not updating transfer speed when directly between containers
- Fixed Multiblock Fluid tanks showing inconsistent information on their goggle overlay
- Creative Fluid tanks no longer show a goggle overlay
- Fixed Funnels and other interfaces not updating properly when affected chunks are unloaded and reloaded
- Fixed tooltips rendering behind item icon in the filter screens
2021-05-08 18:37:30 +02:00
JozsefA
05b56b9b5e Error when missing #flwbuiltins in WorldContext 2021-05-07 22:15:07 -07:00
JozsefA
aa1a45f164 Block breaking overlay is animated now 2021-05-07 21:24:07 -07:00
PepperBell
e05db3cd76 Check for incorrect FluidBucketWrapper usage
Items that use FluidBucketWrapper incorrectly:
- Will not get filling recipes
- Cannot be filled with the spout
2021-05-07 13:33:18 -07:00
Mario
17676822cf Remove Podzol from the grass pressing recipe and add a compatibility recipe for Environmental's Podzol Path 2021-05-07 18:18:32 +10:00
JozsefA
3171a0b7e5 Block breaking animations for arbitrary flywheel tiles.
- Kinda jank so far, but it's great progress.
 - This is also a really good showcase for how flexible the ShaderContext system is.
2021-05-06 18:38:05 -07:00
PepperCode1
da6f2652e7 Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs 2021-05-06 14:15:18 -07:00
PepperBell
970a5c2f53 Fix JEI Scene Lighting
- Fix sudden light transitions in JEI scenes
- Allow block GuiGameElements to set custom lighting
- Remove deprecated GuiGameElement methods
2021-05-06 14:14:31 -07:00
PepperBell
4ed97b3655 Fix super glue rendering
- Fix super glue normals, rotation, and reflection.
- Move render check to appropriate method.
- Minor optimizations.
2021-05-06 14:10:12 -07:00
simibubi
187c448513 Deploying items on items
- Added the Deploying recipe type
- Deployers can now polish items on belts or depots
- Deployers now make a little polishing sound when using sandpaper
2021-05-06 16:40:33 +02:00
JozsefA
9736ba19b5 Things here and there
- Move CreateClient.kineticRenderer to Backend
 - InstancedTileRenderers keep track of their own queuedUpdates
 - Sort of a listener system for some render events
2021-05-04 23:56:50 -07:00
JozsefA
55e3f50f64 MaterialSpecs act alone
- No more awkward MaterialType/MaterialSpec business
 - MaterialTypes are registered directly
 - FastRenderDispatcher merged with backend
2021-05-04 21:00:55 -07:00
JozsefA
b6f13aa7ff More granularity for shader context loading 2021-05-04 16:22:27 -07:00
PepperCode1
b0dad3bf79 Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs 2021-05-04 12:18:55 -07:00
zelophed
ca4ca11232 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-05-04 20:09:18 +02:00
simibubi
859d9fccf6 RenderType hotfix 2021-05-04 18:44:02 +02:00
simibubi
b38dd90431 Subcreatica, Part II
- Diving helmets now display a timer near the hotbar when underwater
- Copper backtanks now play an effect when accumulated air is maxed
- Copper backtank blocks can now be waterlogged
- Copper backtank cogs now animate
- Fixed subtitle of equip sounds
2021-05-04 18:04:00 +02:00
zelophed
dc6baae0ea add a missing placement helper
- for placing small cogs against integrated cog wheels
2021-05-04 17:17:09 +02:00
zelophed
3c4e504f61 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/events/ClientEvents.java
#	src/main/resources/create.mixins.json
2021-05-04 16:12:07 +02:00
JozsefA
bc5630e593 ShaderContexts
- A huge step towards more arbitrary shader usage
 - Need to work on registration of the different parts
 - Things are unorganized
2021-05-03 21:46:33 -07:00
PepperCode1
163361f5ca Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/fix-bugs 2021-05-03 19:55:21 -07:00
simibubi
076783eb7e Subcreatica
- Added the Copper Backtank
- Added Diving helmet and boots
2021-05-04 03:50:17 +02:00
PepperBell
77ee23c208 Fix crate rarity 2021-05-03 18:35:57 -07:00
JozsefA
fcbab5b820 #flwbuiltins and oh so much less overhead
- Put a lot of the reusable code in a sort of standard library
 - Need to evaluate just how much should be lumped in there
 - Still need to allow for users to create alternate contexts for the builtins
 - Normal world and contraptions are still hardcoded contexts
2021-05-03 13:42:23 -07:00
zelophed
fd62f2f8f4 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/CreateClient.java
#	src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java
#	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
#	src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java
2021-05-03 19:58:39 +02:00
zelophed
2442e3ac00 merge & comment cleanup 2021-05-03 18:25:57 +02:00
zelophed
c36346b97d Merge branch 'mc1.16/config-ui' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/command/FabulousWarningCommand.java
#	src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java
#	src/main/java/com/simibubi/create/foundation/command/PonderCommand.java
#	src/main/java/com/simibubi/create/foundation/command/ToggleDebugCommand.java
#	src/main/java/com/simibubi/create/foundation/command/ToggleExperimentalRenderingCommand.java
#	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java
#	src/main/java/com/simibubi/create/foundation/gui/AbstractSimiScreen.java
#	src/main/java/com/simibubi/create/foundation/gui/AllIcons.java
#	src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
#	src/main/java/com/simibubi/create/foundation/ponder/NavigatableSimiScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderProgressBar.java
#	src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
#	src/main/java/com/simibubi/create/foundation/ponder/ui/ChapterLabel.java
#	src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java
#	src/main/resources/create.mixins.json
2021-05-03 16:54:32 +02:00
zelophed
ae76821190 more changes to color and theme 2021-05-03 16:14:58 +02:00
JozsefA
35768b5ade Step towards arbitrary shader contexts 2021-05-02 14:16:02 -07:00
JozsefA
15f4cd305e Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector 2021-05-02 11:50:39 -07:00
simibubi
4974df5c99
Merge pull request #1544 from PepperCode1/mc1.16/model-cleanup
Cleanup Models and Custom Item Rendering
2021-05-02 17:42:48 +02:00
simibubi
b086fbd1f2
Merge pull request #1520 from PepperCode1/mc1.16/reload-listeners
Tweak Reload Listener Classes
2021-05-02 17:39:29 +02:00
JozsefA
2112061db0 Vertex shader abstractions 2021-05-01 23:39:36 -07:00
JozsefA
67e75d747a Move backend 2021-05-01 16:32:09 -07:00
JozsefA
2e16b85190 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-05-01 16:18:32 -07:00
PepperBell
ffd4c75572 Merge remote-tracking branch 'upstream/mc1.16/dev' into
mc1.16/model-cleanup

Conflicts:
	src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java
	src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java
2021-05-01 15:46:50 -07:00
PepperBell
9be5a3ec2a Cleanup 2021-05-01 15:41:03 -07:00
simibubi
8fff3d6745 The great second purge of Tools
- Removed the Blockzapper
- Removed the Deforester
- Handheld Worldshaper -> Creative Worldshaper
- Worldshapers now have a "surface" and "cluster" brush type
- Worldshapers now follow the creative colour palette
- Some UI touch-ups for tools
2021-05-01 13:19:01 +02:00
JozsefA
dc3517eb3a Inversion 2021-04-30 14:28:18 -07:00
JozsefA
37e8e87553 Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/render/backend/Backend.java
#	src/main/java/com/simibubi/create/foundation/render/backend/ShaderLoader.java
#	src/main/java/com/simibubi/create/foundation/render/backend/core/BasicProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlBuffer.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/GlVertexArray.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/FogSensitiveProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/GlProgram.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/shader/ProgramSpec.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/GlCompat.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/DrawInstanced.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/InstancedArrays.java
#	src/main/java/com/simibubi/create/foundation/render/backend/gl/versioned/instancing/VertexArrayObject.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/InstancedModel.java
#	src/main/java/com/simibubi/create/foundation/render/backend/instancing/RenderMaterial.java
2021-04-30 12:15:32 -07:00
JozsefA
c9718b0a1b No more compartments in Flywheel.
It never really needed them in the first place.
2021-04-30 00:31:52 -07:00
JozsefA
322496f3b4 Reformat backend 2021-04-29 17:19:08 -07:00
JozsefA
d9b04138df Whoops flywheels are straight again 2021-04-29 15:12:08 -07:00
JozsefA
063e98983f Oh god the line endings
- Isolate AllBlockPartials to PartialModel
 - Further cleanup to PartialBufferer
2021-04-29 14:03:52 -07:00
JozsefA
446b24f1cf Random stuff
- Multiply by 31 in some hash functions
 - Remove unused render utility classes
2021-04-29 11:44:45 -07:00
JozsefA
e33ab160ac Start to cleanup the AllBlockPartials methods 2021-04-28 22:47:51 -07:00
JozsefA
81b0cf77e1 Contraption renderer checks for flywheel worlds
- Should fix an issue with smaller units
2021-04-28 22:08:45 -07:00
PepperBell
80921ebd6b Remove ISimpleReloadListener lambda types 2021-04-28 21:25:06 -07:00
PepperBell
9140c2ad4c Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create.git into mc1.16/dev 2021-04-28 13:38:26 -07:00
PepperBell
61f2a35a61 Add ISimpleReloadListener
ISimpleReloadListener is a reload listener functional interface meant to
be used when preparation is not needed. All current reload listeners
have been moved to this interface, which allows them to be lambdas and
not have to create a new Object for every reload.
2021-04-28 13:37:21 -07:00
zelophed
f47feee20d its called padding
- also includes some more changes to theme and colors
2021-04-28 21:44:03 +02:00
JozsefA
18d23f69e0 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/en_us.json
#	src/generated/resources/assets/create/lang/unfinished/de_de.json
#	src/generated/resources/assets/create/lang/unfinished/es_es.json
#	src/generated/resources/assets/create/lang/unfinished/es_mx.json
#	src/generated/resources/assets/create/lang/unfinished/fr_fr.json
#	src/generated/resources/assets/create/lang/unfinished/it_it.json
#	src/generated/resources/assets/create/lang/unfinished/ja_jp.json
#	src/generated/resources/assets/create/lang/unfinished/ko_kr.json
#	src/generated/resources/assets/create/lang/unfinished/nl_nl.json
#	src/generated/resources/assets/create/lang/unfinished/pt_br.json
#	src/generated/resources/assets/create/lang/unfinished/ru_ru.json
#	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
#	src/generated/resources/assets/create/lang/unfinished/zh_tw.json
2021-04-28 12:42:41 -07:00
simibubi
ab6b18e42d SoundScapes, Part III
- Increased minimum sound threshold for ambient noise
- Sounds for contraption (dis-)assembly
- Sounds for more wrench interactions
- Hand crank clicks less furiously
- Block breakers now make block breaking noises
- Crafting noises
2021-04-28 17:55:05 +02:00
JozsefA
54f5783489 More versatile ui/settings
- The channel mask still needs work
 - Add contrast filter
2021-04-28 00:01:26 -07:00
simibubi
35d0ce8387 Widget resize
- Condensed the main reading space of config UIs
- Reworked some of the widgets to better arrange themselves in a column
2021-04-27 20:07:29 +02:00
zelophed
de00f90a37 pondering all over again 2021-04-27 02:48:50 +02:00
zelophed
c85870ea2d boxing elements 2021-04-25 19:54:18 +02:00
JozsefA
70188889be Persistence is key
- Projectors now remember their setting and sync between clients
2021-04-23 17:20:16 -07:00
JozsefA
e8ab21c184 More polish
- UI icons
 - Color masking
 - Better scroll ux
 - FilterSphere now has its own file
2021-04-23 14:38:31 -07:00
zelophed
33028e1087 please confirm 2021-04-23 18:11:32 +02:00
JozsefA
3879d55517 Better projector gui 2021-04-22 23:42:49 -07:00
JozsefA
fc919c4ac4 Basic projector gui 2021-04-22 16:02:16 -07:00
JozsefA
7b7c6ef3c5 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/chromatic-projector
# Conflicts:
#	src/main/java/com/simibubi/create/AllBlocks.java
2021-04-20 14:07:54 -07:00
JozsefA
f75422f895 Instruction parallel ray sphere intersection 2021-04-20 14:05:50 -07:00
simibubi
559146ef04 SoundScapes, Part II
- Picking items off belts, depots, basins
- Arms collecting an item
- Mixing noises
- Cranking click noises
- Scroll-input noises
2021-04-20 17:26:46 +02:00
simibubi
9391700c26 SoundScapes, Part I
- Sounds for depots, funnels, cogwheels and generic kinetic rumbling, also fans
2021-04-20 02:19:12 +02:00
JozsefA
e50590f6b7 Start working on the blocks
- Also better control and visuals
2021-04-18 22:23:41 -07:00
tterrag
9697a30d76 Remove references to antlr IntegerList in favor of fastutil IntList 2021-04-18 14:04:08 -04:00
JozsefA
a6248daf7e Better spheres and framebuffer compat layer 2021-04-17 18:55:29 -07:00
JozsefA
128a2c2e06 Remove compat layer wrapper functions 2021-04-17 18:54:57 -07:00
JozsefA
83dc241cd2 Basic spherical effect 2021-04-17 13:04:42 -07:00
zelophed
f0dfc5a6bc align style with ponderUI 2021-04-16 04:22:38 +02:00
simibubi
8a41cd57b0 Quality Software
- Temporary hotfix to Ponder block breaking animations
2021-04-16 01:57:43 +02:00
zelophed
6b80ea1d04 units and tooltips 2021-04-16 01:50:35 +02:00
simibubi
6db763ed5d Seat-hopping into oblivion
- Fixed Seat interaction being too restrictive with max reach
- Contraption seats can no longer be mounted while riding something else
2021-04-16 01:13:46 +02:00
JozsefA
fafd7c84be Everything works as intended 2021-04-15 15:39:34 -07:00
JozsefA
45b1412837 Code sanity 2021-04-15 13:28:23 -07:00
simibubi
db3c296792 Hotfix 2021-04-15 22:03:25 +02:00
JozsefA
f12d9452b4 Shader debugging: scaling the world
In the linearizeDepth function in area_effect.frag, I was multiplying by 2, but the scaling of the world was off. The number I found that works best is e - 0.99, and I have no idea why.
2021-04-15 12:46:54 -07:00
simibubi
3dfe67cd1e Minecarts of Mass Destruction
- Contraptions with exceeding spawn packet sizes no longer get sent to the client
- Minecart Contraptions with exceeding nbt packet sizes can no longer be picked up
- Renamed "Metal Blocks" to "Blocks of Metal"
2021-04-15 20:23:50 +02:00
zelophed
01e5b812c2 changing the server 2021-04-15 15:44:26 +02:00
simibubi
f9d48386ca Scanning the Far Lands for Rails
- Fixed basins not continuing their processing when items are extracted by funnel #1416
- Basins now accept full stacks for items thrown into the top manually
- Fixed Smart Chutes not dropping filter items
- Fixed Smart Chutes not updating attached diagonal chutes properly when removed
- Fixed Server-side crash when coupling two minecarts from a glitched self-colliding pile
2021-04-15 14:43:34 +02:00
simibubi
2fc26f1112 Defer. Everything.
- Millstone now accepts items from belts/ejectors directly
- Fixed Redstone-triggered components losing tile data after moved by a Contraption
- Super glue between non-solids can now be removed while the glue item is equipped
- Fixed Deployers not able to interact with glued blocks
- Fixed incorrect lang mapping of UI button descriptions
- Placement assist block preview now lights properly, doesn't z-fight and fades in gradually
- Pickaxe and Axe are now effective on piston extension poles
- Fixed block breaking animations inside the ponder UI
- Fixed Ponder Scenes rendering on top of the progress bar
- Fixed Mechanical Press not retracting when items were removed early
- Fixed Windmill Bearings allowing to be moved while assembled
- Mechanical Pistons now silence the "missing poles" error after poles were added
2021-04-15 05:19:15 +02:00
simibubi
13f0823ccb Sound Registry Refactor
- Improved registration and datagen for custom and combined sounds
2021-04-14 23:40:42 +02:00
JozsefA
7988fb69a7 Color matrices and many effect spheres 2021-04-13 23:52:52 -07:00
zelophed
fdbdf0ec8d completing the set 2021-04-14 03:27:11 +02:00
zelophed
bb8153f140 texting numbers 2021-04-13 23:54:26 +02:00
JozsefA
db7913d91b It all works, needs some cleanup 2021-04-12 16:00:13 -07:00
simibubi
e92e9a7139 Bad impression
- Mechanical Press can no longer create sheets in bulk, unless configured to
- Fixed Mechanical Press missing items passing on a belt while retracting
2021-04-11 15:24:58 +02:00
zelophed
5b04e82163 boolean toggle 2021-04-11 03:12:43 +02:00
simibubi
d249318b80 Pose stack says no
- TileEntities not appreciative of wrapped worlds are now much less likely to cause a hard crash
2021-04-11 02:56:11 +02:00
zelophed
3de3de89db finally some content 2021-04-10 20:00:32 +02:00
simibubi
976be3470f Better address these, Part II
- Fixed entities attempting to path-find through Creates' non-solids #1390
- Fixed Redstone Links occasionally wiping their frequency when moved in a Contraption
- Fixed Flywheels doubling their SU capacity after every chunk reload
- Fixed display of numeric formats using non-breaking space #1374
- Signs can now be moved on a contraption #1315
- Fixed Typo in german localization #1363
- Fixed Windmill Bearings keeping su information after relocation #1364
- Fixed Symmetry Wand using up too many items #1342
2021-04-10 18:23:42 +02:00
simibubi
9ee42c1824 Wrapped Hints
- Fixed goggle tooltips flipping to the left when too wide
- Can no longer drag the goggle overlay off-screen in the config ui
2021-04-10 03:49:41 +02:00
simibubi
5de2e1ea9d Ghostbusters
- Patched up yet another set of entry points to kinetic source loops
2021-04-10 03:26:38 +02:00
simibubi
939c640e14 Better address these
- Fixed Nixies rendering inconsistently
- Fixed belts not showing items under certain conditions
- Fixed vertical/sideways belts accepting items from other belts
- Spouts can now interact with belts/depots with a mounted funnel
2021-04-10 01:50:13 +02:00
JozsefA
62eb16241b Merge branch 'mc1.16/dev' into mc1.16/chromatic-projector 2021-04-09 16:43:21 -07:00
JozsefA
cbb7e48565 Revert "Don't crash with starlight"
This reverts commit 4ae1ce3d
2021-04-09 16:21:38 -07:00
JozsefA
08b2c498e6 Add basic blocks and TEs for the chromatic projector 2021-04-09 16:16:25 -07:00
JozsefA
536b8d2d5e Fix transparent contraption parts rendering strangely
- It was rendering as if it existed with your hand.
2021-04-09 15:23:51 -07:00
JozsefA
f2c6afdcb3 Fix projection matrix bug
- Copy the projection matrix when vanilla would be uploading it to GL.
 - This should account for just about everything.

Unrelated to the fix:
 - Shader programs now have more flexibility in specialization.
 - Accomplished with IMultiProgram.
 - Remove unnecessary SHADER_DEBUG_OUTPUT boolean.
2021-04-09 14:48:44 -07:00
simibubi
edb1b59f41 Housekeeping
- Added an .editorconfig
- Auto-Reformatted most .java files
- Auto-Organized Imports
2021-04-08 19:22:11 +02:00
zelophed
f9179b3b1d animated colors 2021-04-07 18:47:19 +02:00
zelophed
b1773e9e6b shadow cog 2021-04-07 15:18:37 +02:00
b10203db01 Extract block breaking in TreeCutter.Tree to AbstractBlockBreakQueue for better reusability and option of saw passing a different item 2021-04-07 15:13:07 +02:00
ac8c1e1468 Fixed unported stuff, tree cutter now does sound effects at the right probability again 2021-04-07 14:29:41 +02:00
2613c5be89 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-04-07 14:07:13 +02:00
f19c6ab763 - Deforester now hits forge hooks for tool break, block break, times used.
-Moved deforester not loosing durability from leaves to DeforesterItem instead of Tree mining
- added destroyBlocks method in TreeCutter$Tree for less doubled code
- Mechanical Saws currently break the tree with an empty "hand" as they did before
- Silktouch and Fortune enchants are now being applied from deforesters
2021-04-07 14:07:06 +02:00
simibubi
525001e410 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-07 12:36:39 +02:00
JozsefA
f2b064fa49 Instanced rope pulleys
- The "magnet" texture is broken
2021-04-06 23:17:16 -07:00
zelophed
7ad0575618 fancy text 2021-04-07 02:17:55 +02:00
JozsefA
4b49763e0c Got a weird crash profiling the slideshow machine
- Seems to be a race condition, try/catch should be good enough
2021-04-06 16:52:34 -07:00
JozsefA
40bdbc7048 Instanced rope pulleys 2021-04-06 16:46:24 -07:00
JozsefA
3a52fa573f Merge branch 'mc1.15/dev' into mc1.15/pulley-instance 2021-04-05 23:44:27 -07:00
JozsefA
7a1445f00a Fix nullpointer with starlight 2021-04-05 23:43:39 -07:00
JozsefA
4ae1ce3dbe Don't crash with starlight 2021-04-05 23:23:35 -07:00
zelophed
d4994ddc8b entry point 2021-04-06 00:05:29 +02:00
JozsefA
3b05e06d35 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-03 18:45:23 -07:00
JozsefA
c55351e980 Fix nullpointer with starlight 2021-04-03 18:33:47 -07:00
simibubi
19020b39bf Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 01:53:50 +02:00
simibubi
3da35a30e3 Version up 2021-04-04 01:52:55 +02:00
simibubi
9dc528d96c Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 01:30:18 +02:00
simibubi
b05a03d417 Update NixieTubeBlock.java
- Revert rushed solution to auto nixie control
2021-04-04 01:30:01 +02:00
simibubi
307241e7fd Port new Changes 2021-04-04 00:58:23 +02:00
simibubi
47bd1d9c93 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-04 00:58:14 +02:00
zelophed
e8338d4805 too much backtracking 2021-04-04 00:36:31 +02:00
JozsefA
9d99a5f968 Compromise for render bounding box caching
- Recalculating it once per tick is better than doing it every frame.
 - Only ever doing it once has proven unreliable.
2021-04-03 15:08:06 -07:00
simibubi
62b1fe82b7 Fix-ups Cont'd
- Fixed Spawners losing nbt data when moved
- Nixie tubes now update their texts starting from the clicked block, rather than the leftmost one in the chain
- Fixed inconsistency between block and item model of the furnace engine
2021-04-03 23:49:59 +02:00
JozsefA
ba91eaa4ef Probably fix ghost hands appearing by the player 2021-04-03 14:23:00 -07:00
simibubi
b845809b58 The great Escape
- Adresses #1324
2021-04-03 19:50:42 +02:00
simibubi
69c3a57c76 Quell the outrage!
- Placement indicator arrow is slightly smaller by default
2021-04-03 19:46:26 +02:00
simibubi
d1c8ad38fc Chute extraction refactor 2021-04-03 19:41:33 +02:00
simibubi
9ab5c74929
Merge pull request #1340 from sarim/mc1.15/dev
allow smart chute to transfer whole stacks
2021-04-03 19:31:16 +02:00
simibubi
1fd6b4360c Performant fictional entities
- Fixed crash with the Performant mod when entities are present in a ponder scene
2021-04-03 19:30:38 +02:00
simibubi
83e7074f12 Hot Fix-ups
- Change to proper key handling for closing create screens
- Fixed inconsistent collection behaviour of in-world funnels
2021-04-03 18:59:10 +02:00
simibubi
f528520a53 Destructive Pondering
- Fixed a couple overlooked ponder lang issues
- Fixed weighted ejector not accepting arbitrary gold plates in its recipe
- Fix crash opening ponder from screens with an opened recipe book
2021-04-03 18:33:48 +02:00
simibubi
747849d52e Merge branch 'mc1.16/dev' of https://github.com/Creators-of-Create/Create into mc1.16/dev 2021-04-03 17:55:08 +02:00
simibubi
72789caa01 0/10 not ported
- Fixed text wrapping on ponder text elements
2021-04-03 17:55:06 +02:00
Sarim Khan
463854a2c0
allow smart chute to transfer whole stacks 2021-04-03 21:53:39 +06:00
JozsefA
75f2516408 Hopefully fix ServerWorld class cast exception
- Avoid changing Entity.world, maintain contraption related state in the mixin.
 - Add a mixin to playSound to shift the position of the sound.
2021-04-03 00:42:21 -07:00
zelophed
809bc6bf88 merge and port 2021-04-03 01:16:14 +02:00
zelophed
e05eb5c386 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/config/CClient.java
#	src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java
2021-04-03 01:00:57 +02:00
zelophed
7a6b1c6949 0.3.1 hotfixes, part I 2021-04-03 00:54:28 +02:00
JozsefA
5abc1e0fe7 Instanced pulleys first pass 2021-04-02 13:38:28 -07:00
simibubi
c7a3464151 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-02 22:27:37 +02:00
zelophed
2b00602446 append, not add 2021-04-02 22:14:40 +02:00
simibubi
b1bec1a1f9 Fix-ups
- Filterless Creative Crates now serve as universal supply to schematic-driven deployers
- An attempt to force-update ejectors to not miss out on lid animations
- Fixed schematic-driven deployers not copying safe nbt data
2021-04-02 19:22:41 +02:00
simibubi
c82896998c
Merge pull request #1216 from mrh0/mc1.15/dev
Improved modding support
2021-04-02 18:56:20 +02:00
simibubi
6cfbf26f49 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-04-01 17:46:07 +02:00
simibubi
6c942be7f5 Too slippery
- Sliding on contraptions now takes its slope into account
- Gantry Carriages are now less prone to break when moved near other blocks
2021-04-01 17:43:39 +02:00
JozsefA
4b00562daf Port to 1.16 2021-03-31 21:44:16 -07:00
JozsefA
4908fc1b96 Change some obfuscated variable names 2021-03-31 21:29:17 -07:00
JozsefA
78fbb52ddc Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
#	src/main/java/com/simibubi/create/content/curiosities/TreeFertilizerItem.java
2021-03-31 21:17:01 -07:00
JozsefA
c21a8bcbde Fix startup crash on some AMD drivers.
- The fix comes from Grondag's work on canvas.
 - Original commit: 820bf75409
2021-03-31 20:53:02 -07:00
JozsefA
6ef88c3bd8 Fix some issues with instance rate limiting 2021-03-31 16:25:59 -07:00
JozsefA
b9f6a3b94e Instanced bearings 2021-03-31 16:19:58 -07:00
JozsefA
b743e00978 Better lazy arm instances 2021-03-31 16:18:53 -07:00
240510e3ee Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-31 21:18:43 +02:00
3cc8291b72 Simpler bouncing? Thanks @K1521 2021-03-31 21:18:33 +02:00
Snownee
c02193233b Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/dev 2021-04-01 01:46:52 +08:00
Snownee
ba63cc3e7f Fix tree fertilizer spreading podzol. Backport a440ab6 2021-04-01 01:43:06 +08:00
simibubi
b6857c2a20 Danger Polish
- Fixed Crash when Deployer attempts to use Sand Paper
2021-03-31 15:27:57 +02:00
simibubi
e82f9221b7 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 15:23:18 +02:00
simibubi
5b63f30df3 Abort Mission
- Drills and other block breakers on contraptions now give up trying to destroy a block when their movement direction is reversed
2021-03-31 15:22:41 +02:00
simibubi
2b4ef88fc1 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-31 14:50:16 +02:00
simibubi
d61e387916 The least performant option
- Fixed slow merging of collision shapes
- Improved async handling of the collision shape merger
- BBs far away from an entity now get skipped in the collision cycle
2021-03-31 14:27:27 +02:00
JozsefA
65d21c374b Fix crash making step sounds on servers. 2021-03-30 18:50:07 -07:00
simibubi
0bb18db4b6 Oriented bouncing and sliding
- Slime blocks on a moving Contraption are now bouncy
- Ice blocks on moving Contraptions are now very slippery
2021-03-31 03:16:29 +02:00
JozsefA
376c4e1cb0 Fix crash rendering mechanical crafters on contraptions. 2021-03-30 15:08:42 -07:00
JozsefA
c905aa5e2e Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlyWheelInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MixerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/press/PressInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerInstance.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionKineticRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeInstance.java
#	src/main/java/com/simibubi/create/content/logistics/block/FlapData.java
#	src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInstance.java
2021-03-30 14:58:08 -07:00
JozsefA
4ec25798a5 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-30 14:17:16 -07:00
JozsefA
a2b9dfc28a Change the locks
- InstanceKey is no more.
 - InstanceData and co. keep track of removals and updates.
 - InstancedModel's buffer management is much more sane now.
 - Re-add mixin to #tickBlockEntities and ensure compat with Performant.
 - Move ...backend.instancing.impl to backend.core
2021-03-30 14:14:58 -07:00
simibubi
8a4eaef015 Fix tooltip whitespace 2021-03-30 18:56:22 +02:00
simibubi
9fa63743b6 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:49:13 +02:00
simibubi
ae340ccac0 Spooky ghost honey
- Fixed pipes drawing non-source honey from beehives
- Fixed deployers duplicating glass bottles
2021-03-30 18:48:57 +02:00
simibubi
dba1ff9c34 Port new Changes 2021-03-30 18:34:55 +02:00
simibubi
37c3625d4a Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-30 18:34:40 +02:00
simibubi
3a6714fb08 Handy Tweaks
- Deployers now place block drops into their internal inventory
- Deployers can now harvest honey or honeycombs from beehives
- Pipes can now connect to and drain liquid honey from beehives
2021-03-30 18:10:24 +02:00
simibubi
389b2e0e90 Ponder fix-ups
- Input window elements no longer use integer coordinates
- Comfy reading is now a config option and persists across ponder UIs
- Disabled editor mode
2021-03-30 16:57:21 +02:00
simibubi
c2f3ebbf72 Fix Tooltips on 1.16 2021-03-30 16:32:19 +02:00
JozsefA
ff4a9e5c78 Fix arms glitching out on contraptions.
- Also provide a hook for subclasses of InstancedTileRenderer to control when specific instances tick.
2021-03-29 15:06:09 -07:00
358ff25031 Fix 1.16 too, i guess 2021-03-29 23:25:28 +02:00
zelophed
0b6098817e fix some wrench rotation issues 2021-03-29 20:31:08 +02:00
dadde271e4 Fix even more critical crashes, now on schematics 2021-03-29 18:19:17 +02:00
69f4c9f8ad Fix WrappedWorld.getLightingProvider being null and crashing 2021-03-29 17:19:18 +02:00
90b9a3aff9 Merge & Port 2021-03-29 10:57:50 +02:00
simibubi
5299204fb5 Better Tooltip Integration
- Removed overlapping tooltips
- Adjusted tooltip presentation for more visual consistency
2021-03-28 20:56:55 +02:00
simibubi
bf2a506bb8 A final thought
- Fixed non-splitting modes on brass tunnels
- Ponder scenes for ejectors and tunnels
2021-03-28 18:57:50 +02:00
caa3c57b71 Merge & Port 2021-03-28 10:58:25 +02:00
zelophed
683d18b994 tick off some todos 2021-03-28 04:19:58 +02:00
simibubi
76bd3b3f50 Pondering too fast
- Added a button to slow down ponder scenes while any text is shown on screen
2021-03-28 01:52:04 +01:00
simibubi
fcae7e5c9a Motion commotion
- Update recipe for redstone contact
- Counteracted ejector inaccuracies caused by deferred activation
- Rewired ponder vertex sorting to evade Optifine incompatibilities
2021-03-28 00:45:14 +01:00
JozsefA
d28e60a059 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-27 16:38:36 -07:00
JozsefA
4e7777a130 Fix more instancing nonsense.
OrientedData was still applying the origin position shift, so some
things (mechanical presses) wouldn't appear in the right spot.
2021-03-27 16:35:47 -07:00
1739e72af0 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-28 00:21:13 +01:00
1bffb82ae4 Cogwheel refactor Part III
- Removed the calls to the AllBlocks entries where necessary
- Made placement helpers call the same code as CogWheelBlock.isValidPosition
2021-03-28 00:19:27 +01:00
JozsefA
5f49698a94 Fix mixer weirdness.
- Mixer and Press instances now use the quaternion shader.
2021-03-27 15:06:56 -07:00
7b022cd302 Cogwheel refactor Part II
- Refactored getStateForPlacement to reduce doubled code
2021-03-27 23:05:59 +01:00
4ff20b4217 Cogwheel refactor Part I
- Moved hasIntegratedCogWheel and isSmallCog to ICogWheel
2021-03-27 22:42:27 +01:00
simibubi
497ea4bb66 Foolish not to avoid the lack of counteracting no-clip
- Ejectors now occasionally track launched items, scanning for any obstacles in their trajectory
- Fixed rendered items passing an Ejectors' target on clients ticking faster than their server
- Removed outdated warnings for 'transposer funnels'
2021-03-27 20:14:55 +01:00
6e0e3d28fd Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 19:15:57 +01:00
bec6b1d414 Try to make terraforged less angry against Create world gen 2021-03-27 19:15:52 +01:00
zelophed
a5a9ea1b7f ponder particles, pog 2021-03-27 16:33:23 +01:00
zelophed
c9ba76a2d1 Assisted Placement, Part IV-c
- indicator renders again
- changed the config to allow the indicator to be disabled altogether
2021-03-27 16:01:05 +01:00
JozsefA
fd98bd4976 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 01:10:42 -07:00
JozsefA
a7d714f8ba Fix for ponder particles yeeting Flywheel rendering.
I need to isolate the world load/unload stuff for
Flywheel anyway, a more robust solution is needed.
2021-03-27 01:10:01 -07:00
5dad567766 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev 2021-03-27 08:32:32 +01:00
9bc25db615 Keep everything up to date 2021-03-27 08:32:23 +01:00
JozsefA
4675e0ad15 Stop relying on IDynamicInstance#beginFrame to setup instance state.
- Gantry carriages no longer update when not necessary.
2021-03-26 22:59:47 -07:00
JozsefA
d3d338e64b STE tick optimization.
- SmartTileEntity#tick down to 3.32% from 11.64% cpu time.
 - Measured by JFR over 2 sessions each >8min.
 - Test world was the deployer fields.
 - Iterating over HashMap values is slow.
 - Collect TileEntityBehaviours into a list when the contents of SmartTileEntity#behaviours changes.
2021-03-26 22:02:19 -07:00
JozsefA
cf5eea5a10 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-26 17:31:41 -07:00
JozsefA
0b25f662dc Frame rate and tick rate limiting with distance.
- Significant performance improvement when dealing with massive amounts of dynamic instances, otherwise marginal.
2021-03-26 16:47:37 -07:00
zelophed
7230489b19 placement helper oversight
- shout-out to d'arcy :P
2021-03-27 00:41:09 +01:00
zelophed
56b1170224 Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java
2021-03-26 23:59:19 +01:00
zelophed
687743d18f ponder polish
- some more changes to z-levels in ponder screens
- should be equal to 1.15 ponder now, except for the particles
2021-03-26 23:57:53 +01:00
24c306df90 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-26 23:26:22 +01:00
JozsefA
e91a15cf5f Ejectors wind up again. 2021-03-26 15:25:42 -07:00
60bc6102e2 Add Create stone to base_stone_overworld block tag (terraforged was complaining) 2021-03-26 23:21:44 +01:00
fe10c258c4 Merge & Port 2021-03-26 23:13:49 +01:00
5a176204a5 Merge & Port 2021-03-26 22:17:23 +01:00
simibubi
cb759e793e 3D Printing is cool again
- Fixed Schematicannon clearing blocks outside of a Schematics' bounding box
- Safety check for onBlockPlacedBy with null player
- Deployers with a positioned Schematic as their filter will place blocks accordingly, taking items from the contraption inventory
2021-03-26 22:05:16 +01:00
simibubi
0afb29f9a6 Simulate and Translocate
- Adjusted Brass Tunnels once again to better deal with non-complete item transferrals
- Brass tunnels now always output to their sides first
- Thrown chromatic products are now gravity-less
- Sneaking on Ejectors bypasses them triggering
- Fixed ponder tag item listing
- Ejectors now trigger observers
- Fixed negative bottom pull distance in chutes
- Fixed smart chutes deleting non-stackable items
- Fixed chutes not able to output partial stacks
- Ejectors can now be paused with redstone
- Deferred ejector launches by one tick to 'unground' entities more consistently
2021-03-26 18:41:03 +01:00
f28a3e87f3 No longer keep making new wrappers (but particles still don't work) 2021-03-26 16:50:06 +01:00
1675ee25b4 Fix ponder text being shy and hiding behind other things 2021-03-26 16:27:57 +01:00
35c62360be Merge & Port 2021-03-26 16:03:09 +01:00
9c8d035694 Dya see the dye? 2021-03-26 13:35:45 +01:00
b582b39ae4 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-26 09:11:48 +01:00
5fa8a0b808 Revert "Fix leave finding in saws so compatibility with other mods works"
This is necessary to make the distance gathering work. Sorry me dumb dumb
2021-03-26 09:11:25 +01:00
JozsefA
1d2b51250c Instanced Ejectors and better hashing for BehaviourTypes. 2021-03-25 21:27:08 -07:00
simibubi
718142e26f Faith in your Depot
- Added Weighted Ejectors
- Fixed? some tunnel distribution inconsistencies
2021-03-26 00:15:38 +01:00
JozsefA
2e5d7a734f Fix ConcurrentModificationException preparing frame for rendering. 2021-03-25 15:10:40 -07:00
JozsefA
affb8abfbd Potentially fix weird crash. 2021-03-25 14:48:42 -07:00
JozsefA
a56514c308 Some housekeeping and documentation. 2021-03-25 14:29:52 -07:00
zelophed
8c79174904 fix pressing recipe inconsistency (closes #1296) 2021-03-25 03:58:24 +01:00
zelophed
e26191aaf7 GuiGameReposition
- adjust the position of the item renderer for gui elements
- include a warning when joining a world while fabulous graphics are enabled
2021-03-25 02:27:10 +01:00
JozsefA
b18993ed26 Little things.
- Quark magnets don't crash (already fixed).
 - Fix quark magnet leaving behind ghost instances.
 - Fix crash with belt lighting after being placed by contraptions.
 - Simplify tile add/remove mixins and avoid conflict with Performant.
 - Avoid FloatBuffer detour when uploading matrix uniforms.
 - InstancedTileRenderer no longer has to clean up.
 - Properly let go of tickable instances.
2021-03-24 15:48:15 -07:00
73f87ab44e Exotic smoking
- all blocks tagged as campfires that have the lit blockstate property set to true are now valid smoke sources
2021-03-24 23:42:42 +01:00
4d22b5e9b4 Merge branch 'mc1.15/dev' into mc1.16/dev 2021-03-24 15:07:51 +01:00
7eafbe5757 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-03-24 15:07:04 +01:00
16586747a6 Increase priority, less crashing with performant 2021-03-24 15:06:54 +01:00
cbbf502003 port recent changes 2021-03-24 14:54:24 +01:00
JozsefA
1233ecfe80 Fix belt lighting issues, again. 2021-03-23 14:13:32 -07:00
JozsefA
5eae3a53fc Keeps getting hotter.
- Belts now use the new system.
 - Remove ILightListener.java.
 - Listeners can choose to remove themselves.
 - Rename some static GridAlignedBB methods.
2021-03-23 02:12:09 -07:00
JozsefA
20189a86fc Spicy light update listening api.
- Round 1, no profiling done yet, not everything uses it.
 - WeakHashSet could be useful elsewhere, too.
2021-03-23 00:08:31 -07:00
JozsefA
1310b88828 Lieutenant Scatterbrain II.
- Swich to tabs. (not everything is tabs yet)
 - Refactor light and color attributes to their own Enum.
 - Quaternion/pivot/position attribute shader.
 - Always update an instance when the WorldRenderer checks if it should rerender a block.
 - Simplify some names.
 - Remove generics in InstanceData classes.
 - Deployer Tiles now use the oriented material.
 - Press heads now correctly orient themselves.
 - ModelData buffers things faster and is simpler.
2021-03-22 20:20:52 -07:00