Commit Graph

1822 Commits

Author SHA1 Message Date
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