Commit graph

954 commits

Author SHA1 Message Date
simibubi
3301f8ff01 Honey, I'm blue!
- Evade fluid tinting issues with optifine
2020-12-04 23:31:12 +01:00
simibubi
9e4b92babf Other options are available
- Added a handful of crushed ore compatibility (+spicy datagen)
- Lapis sheets are now tagged
2020-12-04 18:10:07 +01:00
grimmauld
1a384b99fd Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-12-04 16:59:14 +01:00
grimmauld
f85c47e9b1 Cart Contraptions now keep their item name 2020-12-04 16:59:05 +01:00
simibubi
8ec74ee96d Minor contraption annoyances
- Fixed belts sometimes popping off when disassembling a contraption
- Made Portable Storage Interfaces a little more lenient to engage at funny angles
2020-12-04 00:21:30 +01:00
simibubi
2a56bb76be Casing case closed, Part II
- Encasing fluid pipes now locks their configuration
- Encased fluid pipes now join textures with adjacent casing blocks
- Fixed windowed pipe not allowing to be encased
- Fixed wrapped models not passing down model data in multi layered situations
2020-12-03 23:49:12 +01:00
simibubi
16705c5cb5 A flock of fluids
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +01:00
simibubi
00b01cac55 Fix pipe brackets not rendering on contraptions 2020-12-02 22:34:26 +01:00
simibubi
e3bef624a0 Casing case closed
- Encased shafts and gearboxes can now join textures with respective casing blocks
- Added back encased shaft items for creative mode
- Fixed encased shafts able to be created with casing and cogs
2020-12-02 21:49:57 +01:00
simibubi
4ad52b6cc7 Port recent changes 2020-11-30 18:54:33 +01:00
simibubi
2888ba9f39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-30 18:54:13 +01:00
Daniel Amberson
da5ae87bec contrast? in my copper???
it's more likely than you think!
2020-11-30 10:53:12 -06:00
simibubi
da5aaebe1b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-30 15:26:43 +01:00
simibubi
ccae111ec8 Reversing the reversed
- Controller rails can now control furnace minecarts
- Controller rails now snap to adjacent rails with the correct facing
- Controller rails no longer get reversed when transitioning to or from a slope in certain orientations
- Controller rails are now craftable
- Fun refactors
- Updated texture
- Recipe adjustments
2020-11-30 15:23:37 +01:00
grimmauld
628afa52d1 Fix cocoa beans on contraptions crashing the server 2020-11-30 13:23:35 +01:00
Zelophed
a760ff8a79 Tinted Love
- apply redstone's block coloring to the controller rail
- add a little more polish to the piston pole placement helper

- textures at create:block/controller_rail_on and _off are currently unused, _analog is used for item only i think
2020-11-30 12:29:50 +01:00
grimmauld
f0a67a8e88 Port changes to 1.16 2020-11-30 09:55:39 +01:00
grimmauld
59e377c7ef merge recent changes 2020-11-30 09:48:38 +01:00
grimmauld
32d8869b8a D 2020-11-29 23:21:38 +01:00
simibubi
0a7ebac586 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-11-29 23:01:21 +01:00
simibubi
bf869010f0 Minecart Purgatory
- Further attempts at improving the coupling physics
- Fixed reversed couplings losing their physics entry point
- Fixed "angel block" placement through super glue
2020-11-29 23:01:18 +01:00
grimmauld
58601e827e Interpolation please! 2020-11-29 17:30:53 +01:00
grimmauld
94aa5ea4c7 Wrench QOL: Helping the controller to not loose control over supporting blocks while wrenching it
Plus a bunch of refactoring to make things easier for the next changes
2020-11-29 13:23:36 +01:00
tterrag
696393ec41 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/lang/unfinished/de_de.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/main/java/com/simibubi/create/content/contraptions/base/GeneratingKineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/base/IRotate.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java
#	src/main/java/com/simibubi/create/content/logistics/block/chute/ChuteTileEntity.java
#	src/main/java/com/simibubi/create/foundation/item/ItemDescription.java
2020-11-28 17:24:30 -05:00
grimmauld
72596f63d4 Placement logic please 2020-11-28 23:06:09 +01:00
grimmauld
0231b32866 Someone get those damn mine carts under control!! 2020-11-28 21:12:31 +01:00
tterrag
1bebaa6faa Cache light levels by position within SuperByteBuffer#renderInto 2020-11-27 23:46:51 -05:00
Kryppers
4d564464c5 Cu Later!
Updated copper oxidisation.
2020-11-27 22:39:06 +00:00
simibubi
cbe23a6aba Fix coupling data not being sent to clients 2020-11-27 20:37:10 +01:00
simibubi
a49aad24c2 Filter redundancy
- Brass tunnels now distribute across matching filtered outputs exclusively before sending items to unfiltered sides
- Less chute logic on render thread pls
2020-11-27 18:26:17 +01:00
Daniel Amberson
b24648b431 i foRGOT ONE
A
2020-11-27 10:48:38 -06:00
simibubi
e7a22c96e9 Funnels for everybody
- Fixed flapfunnels not taking secondary items off depots
- Funnels can now sit horizontally on saws and drains
- Added a recipe from natural to regular scoria
2020-11-27 17:19:11 +01:00
simibubi
bbe0914b2f SU to confuse you
- Reworked some of the tooltips presented by kinetic components
2020-11-27 13:31:55 +01:00
simibubi
b2e74463e3 All your basin are output to us
- Added useful goggle information to chutes
- (0.3.0) Chutes can no longer carry a fan-like air stream
- Fixed chutes overwriting contained items when picking them up from below
- Basins can now push outputs to any open inventory
- Basin output can now be controlled using a wrench
2020-11-27 01:37:22 +01:00
simibubi
cfe28cdd61 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 15:48:54 +01:00
simibubi
d5ddb476c5 Belt casing hotfix 2020-11-26 15:48:31 +01:00
simibubi
757b65f136 All caught up
- Port recent changes to 1.16
2020-11-26 00:57:50 +01:00
simibubi
e8edbcdb11 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-26 00:57:29 +01:00
simibubi
0b24523b8c Get to the copper!
- Some asset rewiring
2020-11-26 00:17:49 +01:00
Daniel Amberson
b774956491 windows to hell
frick
2020-11-25 16:18:40 -06:00
Daniel Amberson
73e7df4227 "but the copper doesn't look minecraft-y enough!!"
yeah??

here you go, shush
2020-11-25 16:13:45 -06:00
simibubi
8ff98dc3fb Fluid Delivery
- Fluid Tanks and Creative Fluid Tanks now form a combined fluid inventory on contraptions
- Added the Portable Fluid Interface
- Fixed tanks placed with nbt not clamping their contained fluids
- Item Storage information on Contraptions no longer get sent to the client
- Combined fluid storage synchronizes to the client and applies new contents to the corresponding mounted TE renderers
- Fixed motion of dripping potion particles from fluid pipe flow indication
- Portable Storage interfaces now interrupt their connection when receiving redstone power
2020-11-25 18:54:59 +01:00
simibubi
0d9a6cc8c3 Tanks of Jank
- Fluid tanks now attach the full multiblock when a part of them is moved by a contraption
- Fluid tanks now rotate and mirror properly
- Fluid tanks now react to movement properly
- Creative fluid tanks no longer lose configured fluid when more tanks are added to it
- Fluid tanks no longer render ghost fluids when placed with nbt
- Fixed some inconsistencies with tanks distributing fluids when connecting/disconnecting in multiblocks
- TileEntities are now being considered when rendering static blocks in a moving structure. Fixed brackets and tank blocks not rendering properly
- Poles no longer display their length when used for decoration
- Increased scope of caught exceptions when rendering modded tes in schematics and on contraptions
2020-11-24 16:56:02 +01:00
Zelophed
c5163f0953 Pole Vault
- add placement helper for piston extension poles
- add piston pole length to goggle overlay
- fix mechanical pistons being a little too generous with pole alignment
- allow ProperDirectionalBlocks to be rotated with the wrench
2020-11-22 14:27:50 +01:00
simibubi
ddf28cfcea More collision polish 2020-11-22 13:22:36 +01:00
simibubi
f9d9fe27e1 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-20 22:42:00 +01:00
simibubi
b20359808a Unstable stabilizers
- Fixed clients getting forcibly disconnected due to uninitialized contraption data serialization
2020-11-20 22:40:30 +01:00
simibubi
d3f03a57a9 Port recent changes to 1.16 2020-11-20 18:24:43 +01:00
simibubi
f8fd6dbb66 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-20 17:50:04 +01:00
simibubi
df8d2ddbee Merge branch 'mc1.15/contraption-experimental' into mc1.15/dev 2020-11-20 16:35:26 +01:00
simibubi
4c960ef1ed Clean up
- Fixed stabilizer bearings not always rotating their head against parent transform
- Windmill bearings now display a tooltip when waiting to be updated by a player
- Removed obsolete overrides from hotswapping streak
2020-11-20 16:28:57 +01:00
simibubi
1961f9afdc Collision pls
- Fixed inconsistent collision response to players respawned from near a contraption
- Fixed an inverted condition from the refactor
2020-11-20 12:43:34 +01:00
simibubi
e5c4b31458 Refactor Attractor
- More cleaning up and major refactoring in Contraption entity implementation (needs testing)
- Minecarts can no longer be mounted on seats
- Mechanical bearings now "stabilize" rotation of a contraption with an attached sub-contraption
2020-11-19 21:07:32 +01:00
grimmauld
5a89fe7076 Fix max schematic size warning 2020-11-19 18:17:30 +01:00
simibubi
a3501bd5a3
Merge pull request #513 from ugudango/mc1.15/dev
Casted ByteBuffer to Buffer in multiple places
2020-11-18 11:16:45 +01:00
grimmauld
a2e28db761 Actually fix tooltips on 1.16 2020-11-17 22:20:00 +01:00
grimmauld
20d1403ede Fix getUnformattedDeepText breaking with translation text components, which resulted in double tooltip text 2020-11-17 14:58:48 +01:00
grimmauld
d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
grimmauld
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +01:00
grimmauld
7bd339e655 Fix typo and messed up key 2020-11-17 14:13:53 +01:00
ugudango
3635611365 Casted ByteBuffer to Buffer in multiple places, for better backwards compatibility. 2020-11-17 01:46:27 +02:00
grimmauld
1a7bf39fc1 Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
2020-11-15 15:21:38 +01:00
grimmauld
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01:00
simibubi
e4fa2de11e PR dusting
- Some lang fixes/adjustments
- runData
2020-11-14 22:53:15 +01:00
simibubi
209f26f448
Merge pull request #507 from kohlth/mc1.15/dev
Tweak P.S.I tool tip for clarification
2020-11-14 22:35:57 +01:00
simibubi
95c07b28be
Merge pull request #506 from Creators-of-Create/Noobulus-tooltip-patch-1
Fixed some tooltips
2020-11-14 22:14:37 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
lizelive
730078f76a
fix build error (#509)
* fix #508 build error
2020-11-14 21:19:48 +01:00
grimmauld
fb46a8b59a Nozzles on Chutes 2020-11-14 16:48:32 +01:00
grimmauld
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
grimmauld
f01d80fd04 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-11-14 12:18:01 +01:00
grimmauld
2a9542e2bb Loading 1.14 worlds? Yes please.
Added highly experimental remap event support
2020-11-14 12:15:38 +01:00
simibubi
9a7596286d JEI Integration: Spout and Drain 2020-11-13 20:56:39 +01:00
simibubi
103c1a7441 Lifeless Flames
- Empty blaziers can now be lit using flint and steel
- Blaze burners now have ambient sounds and sounds played when fed items
2020-11-12 12:58:26 +01:00
kohlth
8b4736c609
PSU minor tooltip tweak for clarification
Made it clearer you insert/extract from the stationary interface
2020-11-11 22:04:40 -06:00
Snownee
c730517fb4 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/snownee
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2020-11-12 08:03:24 +08:00
simibubi
675af419ce Fixing user errors
- Added hints when looking at
-    Mechanical arms with no targets
-    Funnels attempted to be used like 0.2 transposers
-    Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +01:00
simibubi
287db27ef0 The Funnel doesn't end here
- Updated wrench model (Kryppers)
- Funnels on depots and perpendicular to belts use a new model
- Funnels at the end of belts
    - no longer have a directional constraint
    - can now be extended/retracted manually
    - now hold items back at the block boundary
- Extracting Funnels on top of belts can now specify an amount no their filter, taking x items off a nearby stack when possible
- Fixed some issues with belt/funnel interaction
- Items reaching the end of a belt will still be regularly checked by perpendicular funnels in the space
- Contraptions now render blocks in appropriate render layers
- Straight diagonal Chutes now create an intersection when a funnel is directly above them
- Attempted a safety fix to bracket removal from shafts and cogs
- Fixed windmill structures not stalling when their attached network is overstressed
2020-11-11 19:00:31 +01:00
Snownee
6cc6973bc8 Fix BeltInventory.eject different behavior in orientations 2020-11-11 11:54:04 +08:00
Snownee
466739bcf5 Fix Extendo Grip knockback 2020-11-11 10:52:57 +08:00
Noobulus
6d1b1e2474
Fixed some tooltips
Added a period to the end of the Spout tooltip to match other tooltips
Fixed the blaze burner tooltip (was using blaze_heater, which I assume is an older name for the block)
2020-11-10 12:14:34 -06:00
Snownee
85b3ab2025 Fix SchematicWorld NPE 2020-11-11 01:48:42 +08:00
Snownee
5bd6110d59 Implement GuiBlockModelRenderBuilder tinting 2020-11-11 01:17:06 +08:00
Snownee
1afab1dd51 Fix slab loot tables 2020-11-11 00:57:29 +08:00
Snownee
196083cb00 Packet workaround 2020-11-10 00:51:56 +08:00
Snownee
6b34eb453d Defensive coding to prevent client chunk loading 2020-11-08 22:54:46 +08:00
Snownee
2e3100be9a Fix JEI ingredients getting merged incorrectly 2020-11-08 20:53:12 +08:00
Snownee
671f307071 Fix blockzapper duplicating bonemeal and breaking bedrock 2020-11-08 18:12:44 +08:00
Snownee
5958370900 Give ProcessingOutput a default count 2020-11-08 17:30:40 +08:00
Snownee
428dda58e7 Fix deployer duplicating Quark pickarang 2020-11-08 16:30:55 +08:00
Snownee
073e3980ee Fix water rendering overlay on glass blocks 2020-11-08 16:29:58 +08:00
simibubi
fb06dc5e72 Port new changes to 1.16 2020-11-06 20:56:19 +01:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +01:00
simibubi
dbfe7f93fa Spinny vortex
- Crushing wheels no longer z-fight with chutes
- Improved rendering of items and fluids inside basins
2020-11-06 19:45:38 +01:00
simibubi
d5f08aab76 Brackets and spilled potions
- Added wooden and metal brackets
- Brackets can be applied to shafts, cogs and fluid pipes
- Brackets prevent pipes from connecting to adjacent pipes
- Fixed blockzapper not showing up in the searchable creative menu
- Added config values for hose pulleys
- Hose pulleys now extinguish lit waterloggable blocks
- Hose pulley now break blocks that cannot withstand vanilla fluid flows
- Spout is now wrenchable
- Fixed spout not activating properly
- Added fluid particles that supports fluids without a block variant
- Potion fluids now apply their effects to nearby entities when spilling from an open end
- Fixed pumps not rendering fluid particles when spilling/pulling fluids directly
- Hose Pulley no longer accepts fluids that cannot be placed
- Hose Pulleys and open pipes can no longer place water in the nether
- Some Refactors to the particle system
- Reverted reversed crtl activation for schematic tools
- Added a command to fix broken lighting in some of creates models (enables experimental forge block rendering)
- Fixed fluid ingredients in jei once again
- Fixed fluid tag ingredients being resolved on the client
2020-11-04 19:08:01 +01:00
simibubi
910bdf5d19 Port changes to 1.16 2020-10-30 19:47:40 +01:00
simibubi
d26139576c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-30 19:36:03 +01:00
simibubi
e701569fee Automatic Acrobatics
- Added the item drain
- Refactored pulley renderers
- Fixed belt funnel not dropping filters
- Fixed funnel filter slot positioning on upward facing funnels
- Sails can now be sheared
- Fixed the kinetic connectivity of the rotation speed controller
- Valve handles can now by dyed in world
- Seats can now be dyed in world
- Fixed Stockpile Switch emitting redstone power towards its detection target
- Organized Imports
- Fixed server launch issues
2020-10-30 19:28:33 +01:00
simibubi
a9c90cd2b6 Clean-up Crew
- Fixed datagen
- Fixed tank multi-place
- Organized imports
2020-10-30 12:18:21 +01:00
Bob Dole
16ab29be1d Converted to 1.16 appropriate ways - builds 2020-10-30 03:11:07 -04:00