Commit Graph

411 Commits

Author SHA1 Message Date
Daniel Amberson
34a3db1c20 hi mixels are bad
I didn't check but I'm pretty sure the only perfectly aligned textures were the axels
2020-08-28 08:17:34 -05:00
Daniel Amberson
1bff36e40f the redstone reciever recieved a replenishing retexture
(and the transmitter too!)

also bark is dumb
2020-08-28 06:43:27 -05:00
Daniel Amberson
d57f5d45ff something??
I got scared these files got overridden in some way so I saved over them and did... something.
2020-08-26 23:21:09 -05:00
simibubi
0349217082 Grunt work detected
- Added a foundation for generating recipes of vanilla types
- Transferred a couple recipes from main to generated as POC
2020-08-27 02:35:57 +02:00
simibubi
0d1085ef09 Late-night adjustments
- Reduced ambient dripping particles of fluid pipes
- Fixed reversed uvs on encased fans
- Fixed tile entities not being added to contraptions client-side
2020-08-25 23:33:39 +02:00
simibubi
e52765cce0 Encased and Windowed Pipes
- Added encased and non-opaque versions of the fluid pipe.
- Added new generic te behaviour across pipe blocks for their rims/attachment models
- Pipes and pumps now render a little drain cap when connected to a fluid inventory
2020-08-25 20:12:33 +02:00
simibubi
a4b4c770be Asset Break
- Implemented reworked chute models by Kryppers
- Implemented new basin model by Kryppers
- Chutes now have proper selection bounds
- Some minor texture & model touch-ups
- Fixed symmetry wand position in its GUI
2020-08-24 23:45:37 +02:00
simibubi
2040d66c3e Fundamentals of Fluid Transfer
- Fixed some inconsistencies with a tanks' fluidhandler invalidation when resized
- Patched crashes in present fluid handling of the basin
- Tanks now slightly shade horizontal faces of the contained liquid
- Tanks no longer resend data every tick when filled gradually
- Introduced a new lerped value type with better design decisions
- Refactored Smart tileentity serialization to better support custom overrides in contained behaviours

- Pumps propagate flows in the pipe networks in front and behind itself.
- Pumps collect all possible in and outputs across the reachable pipe graph as endpoints
- Flows move across multiple branches of a pipe network when both are equally viable
- Open-ended pipes are treated as endpoints and leak fluid into and out of a block space
- Open endpoints serialize stateful information about fluid units gathered and held at the interface
- Open endpoints turn a fluid block into 1000 fluid units and back
- Open endpoints undo their transaction when their flow changes from pull to push
- Open endpoints cannot pull fluids back when a full liquid block was not placed yet
- Open endpoints waterlog blocks when the provided fluid is water
- A collision response is triggered when different types of fluids meet at open endpoints
- Fluids are transferred instantly by the throughput of a completed flow per tick
- Pumps cut flows when vital pipes are removed
- Pumps do not lose progress of finished flows when an unrelated part of the pipe network changes
- Pumps do not lose progress of finished flows when reversed
- Pumps distribute their throughput across available input flows evenly
- Pumps distribute gathered input fluid across outputs evenly
- Pumps expose furthest reachable pipefaces to other pumps for chained transfer
- Chained pumps with fully overlapping flow sections provide their endpoints at the entrance of the other pump
- Chained pumps with overlapping flow sections participate in two shared endpoints, one for each pump dominating the contested region
- Chained pumps with overlapping flow only transfer via the optimal of the two possible endpoints based on their speeds
- Chained pumps of equal speed pick one of the two available endpoints deterministically
- Pumps transfer without flows when no pipe is between the pump and the endpoint
- Pumps serialize and recover stateful information about held fluid units at open endpoints
- Chained pumps do not actively transfer when both are partaking with push flows (or both pulling)
- A pull flow originating from an inter-pump endpoint only commences when the corresponding push flow is completed
- Chained pumps re-determine the optimal flow when the speed of one is changed at runtime
- Throughput of chained pumps is determined by their weakest link in terms of speed
- Endpoints created for chained pumps is treated equally to other available endpoints when fluid is distributed
- Pipes do not contain a physical amount of fluid.
- Pipes never hold serialized vital stateful information about fluid transfer.
- Pipes synchronize local flow progress and fluid type to clients
- Flows in a pipe progress with the speed of the network flow
- A networks flow speed depends on the speed of the aggregated pump
- Pipe flows of different flow graphs of different pumps interact with each other
- A collision response is triggered when two different types of fluid meet within a pipe
- Pipes spawn particles to illustrate contained flows/liquids of flows
- The fluid transfer role is exposed through a TE behaviour with some callbacks and properties
- Open endpoints show particles when interacting with in-world fluids
2020-08-24 21:02:03 +02:00
7493da4543 fix quark wart loop 2020-08-18 23:01:10 +02:00
Zelophed
bc5bcd0a6d whoops, forgot about this 😳 👉👈
- encased shaft supports multiple casings, applied with right click
- fix gl state after rendering our cube particle
2020-08-18 13:53:05 +02:00
Daniel Amberson
7e3dd8f701 the linear chassis blocks no longer look bad
or, at least, as bad
those bolts didn't look nearly as good as I thought they would
2020-08-12 13:55:45 -05:00
simibubi
7e167f3b29 Couple things, Part I
- Added Foundation and POC of minecart couplings and carriage contraptions. highly unstable
2020-08-05 22:10:05 +02:00
Daniel Amberson
ffe3cf4f71 VERY small nitpick
y'all probably won't even notice it but it bugged the frick out of me
2020-08-05 10:04:53 -05:00
Daniel Amberson
e1131c7ad9 the casings no longer look like garbage
yay
you can actually reasonably build with them now :V
2020-08-05 09:11:11 -05:00
simibubi
a5e666d85e casings, indeed.
- Implemented the new casing variants
- Fixed missing particle textures on cogwheels
- Implemented Copper Tiles
2020-08-05 00:41:07 +02:00
Daniel Amberson
b9fd7b0512 casings!
shadowosteel
2020-08-04 17:16:58 -05:00
Daniel Amberson
6bed40d01b Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-08-04 12:00:55 -05:00
Daniel Amberson
0a34d289a5 brass/andesite cog retexture + others
-brass and andesite cogs got a glowup
-the smouldering blaze now looks properly ominously hot
-owo
2020-08-04 12:00:52 -05:00
KhottyManatee55
7d4adbb38d
The addition of the Russian translation 2020-07-29 13:57:47 +03:00
tterrag
515eb0026d Improve blaze burner particles
- Now curl around blocks that are placed above
- Spawns a burst of particles when fuel is added
2020-07-28 23:57:29 -04:00
Kryppers
79e78fc2d2 Solved the riddle of the extendo_grip
also updated some textures or whatever...
2020-07-27 12:33:19 +01:00
Kryppers
4f8fe51b7f Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-27 11:14:03 +01:00
Kryppers
54288e0e2d Polished up the extendo-grip 2020-07-27 11:13:54 +01:00
Daniel Amberson
b5628704f4 cogwheel cleanup
de-noising the large cogwheel and removing the weird atlas-destroying palette from the small cogwheel
2020-07-26 20:29:24 -05:00
Daniel Amberson
531628f784 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-26 19:29:21 -05:00
Daniel Amberson
32f9a39430 cogwheel glowup
the cogwheels no longer have stretched vanilla textures, they now have their own unique textures

also blockbench is dumb and reverted my progress \o/
2020-07-26 19:29:15 -05:00
Kryppers
82b6d635cc copper-tacular!
Little tweak on the last stage copper oxidisation, plus the sprite set for copper tiles.
2020-07-26 15:57:37 +01:00
Daniel Amberson
b731d2308e there's MORE?
how does this keep happening
2020-07-25 17:41:02 -05:00
Daniel Amberson
f3a8040a25 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-25 17:03:15 -05:00
Daniel Amberson
acb6770c19 FORGOT ONE
how
2020-07-25 17:03:11 -05:00
simibubi
80406e8782 Cleanup crew
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
simibubi
f5af1cd81e Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-22 19:07:33 +02:00
simibubi
7994835cb0 Seats, part II
- Any living entity can now use seats
- Fix client sync issues with seats
- Fixed contraptions double-reversing roll and pitch values when communicating to the collision engine
- Seats now transfer their passengers to a contraption when moved and back when disassembled
- Attempted further refinements to the collision response of horizontally rotated contraptions
- Set up a hook to inject custom interaction between players and contraption mounted blocks on right-click
- Seats can now by mounted by players while assembled to a contraption
- Minor refactors to the contraption class
2020-07-22 01:18:09 +02:00
Daniel Amberson
4957434cd0 Electron tube tweak
the actual quartz glass part is no longer nearly as saturated, and has a better visual hint of being translucent
2020-07-20 18:52:18 -05:00
Daniel Amberson
4ac06fb648 General polished item textures
just random item sprites I thought would be good
2020-07-20 16:50:44 -05:00
Daniel Amberson
251bc5fb37 bark is DUMB
don't use bark in your engineering plans for machines, you'll regret it
2020-07-20 16:37:40 -05:00
Zelophed
2a3da7e4d0 he do be munching tho
-added sounds to the runData again
2020-07-19 17:08:20 +02:00
Kryppers
6076dc22a2 Update brass_tunnel_top_connected.png
fixed up a texture missing from the brass update
2020-07-19 12:11:16 +01:00
simibubi
257dc11f55 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-19 00:32:11 +02:00
simibubi
217138255e Tanks, Obama
- Reworked fluid tanks to incorporate new assets and functionality
2020-07-19 00:22:14 +02:00
Zelophed
b2a5a4822a more changes to heater and particles
-heater now uses a enum for the blaze state
-added new particles for the heater
-changed heaters voxel shape
2020-07-18 20:07:22 +02:00
e7a851c8c0 Fixed block tag gen and loading, fixed fan generating over extinguished camp fires 2020-07-17 09:40:09 +02:00
simibubi
e276302cee LeastReality's Belt Tunnel Rework
- Replaced belt tunnel assets; adjusted blockstates and animations accordingly
2020-07-16 19:13:00 +02:00
Kryppers
e686906b22 Oxidised blocks 2: Electric Boogaloo
tweaked the oxide textures further based on the team feedback
2020-07-15 20:36:39 +01:00
Daniel Amberson
4a95236b11 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-15 13:47:24 -05:00
Daniel Amberson
346b52fff7 More brass and copper polishing
some other blocks I didn't get to retexture in the first round
2020-07-15 13:47:03 -05:00
Kryppers
b773019a05 Copper Oxidised Blocks
Updated all the copper oxides blocks
2020-07-15 18:19:59 +01:00
Daniel Amberson
6c573e1424 Missed one
how the frick I thought I did this one too--
2020-07-15 07:15:08 -05:00
Daniel Amberson
30cae32805 Polished brass and copper textures
if anything's screwed up then I take no responsibility
2020-07-15 07:08:52 -05:00
55d91ef4a1 crude heater particles 2020-07-15 13:39:45 +02:00
9fe29193de Heated Mixing JEI support 2020-07-14 19:50:23 +02:00
0580318b38 new heater fuel and fueling system 2020-07-14 15:54:02 +02:00
42b78b01eb Blaze heater fan interaction
- moved fan transparent blocks to block tag
- added blaze heater as transparent
- blaze heater on lowest level is now a valid bulk smokig block
- blaze heater on heat 2 and higher is now a valid bulk smelting block (that requires fuel but does not spill lava or set your house on fire)
2020-07-14 00:05:22 +02:00
509edd9181 Empty Blaze Heater
- added empty blaze heater
- catching blazes (rclick blazes or a blaze spawner)
- only blaze heaters with blaze can heat basins or power fans
- updated item tooltip to fit the discussed fueling system
2020-07-13 23:33:55 +02:00
a44ef1733b Merge branch 'heatedMixer' into mc1.15/dev 2020-07-12 14:54:03 +02:00
12595490c7 Heater functionality:
- Heated Mixing: Mixing can now require the player to heat the basin (with either the usual fan heaters for a heat level of 1 or the blaze heater for higher heat levels)
- Made mixing brass ingots from copper and zinc ingots require heating (as example)
- added the blaze heater to valid fan heaters
- added TE renderer for fan heater to display a blaze head always facing the player
- added fueling of blaze heater with furnace fuel (onUse event, not with inventory to challenge the automation. To be discussed.)

todo:
- add heat requirement display to JEI
- better item model for blaze heater
- new special fuel for higher heat levels
- fan stoking
2020-07-12 13:13:43 +02:00
ae785b5a66 blaze_heater 2020-07-12 10:57:53 +02:00
simibubi
a0ff70a1bb Not enough polish
- Reworked belt assets and renderer once again
2020-07-12 02:05:29 +02:00
simibubi
1ea7eeb040 Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-11 12:33:01 +02:00
simibubi
04b81128cd SeatState
- Added textures, models and blockstates for seats
2020-07-11 01:28:37 +02:00
simibubi
367296e6c1 Logistical enhancements and fixes
- Arms can no longer insert into powered brass funnels
- Slight ArmInteractionPoint refactor
- Arms can now interact with Millstones, Basins, Jukeboxes, Crushing Wheels and the Mechanical Saw
- Fixed crash when logging into a world with a running mixer
- Arms now start to dance when one of their in or outputs is a running jukebox
- Arms can now be mounted on the ceiling
- Arms now always prefer the interaction points that were selected first
- Fixed belt funnels not updating their blockstate properly when transitioning from other funnel types
- Vertical funnels next to the end of a belt will now stall the belt when unable to collect incoming items
- Minor model & texture touch ups
- Arm no longer cancels player interaction when its empty handed
- Fixed chutes not vertically interacting with andesite funnels
2020-07-10 19:48:04 +02:00
simibubi
8d056d082a Brass Tunnel connectivity and filtering
- Brass tunnels now visually connect for upcoming splitter functionality
- Added a tileentity behaviour that allows separate filtering for each face
- Added filtering to brass tunnels
2020-07-08 22:24:33 +02:00
simibubi
279504cccf Tunnel clean-up & QOL
- Removed synchronization behaviour of belt tunnels
- Belt tunnels can now be placed on non-reinforced belt segments, and will apply the missing casing automatically
- Bunch more renames
- Small tweaks to the andesite tunnel texture
- Mechanical arms can no longer take from belts covered by a tunnel
- Belt tunnels can now create a window when directly next to a funnel
- Fixed tunnel flaps not being triggered when inserting into a covered belt
2020-07-08 13:41:55 +02:00
simibubi
dbd89199ac Andesite Logistics
- Removed pre-0.3 funnel blocks
- Added andesite variant to reality funnels, without filtering or redstone control
- Added andesite variant to belt tunnels
- Reality Funnel -> Brass Funnel
2020-07-08 01:36:34 +02:00
simibubi
6511cbcd7b Belt casing overhaul
- Sideways and Vertical belts can now be reinforced with casing
- Belts can now be reinforced with andesite casing
- Reinforcing belts no longer consumes the casing block
- Reworked reinforced belt models
- Fixed flipped diagonal belt casing once again
- Fixed belts breaking instantly when punched in survival mode
2020-07-07 16:03:49 +02:00
simibubi
0f4d65778e Belt model polish
- Touched up belt models
- Fixed bottom/top diagonal belt casing being reversed
2020-07-07 00:48:53 +02:00
d5c98043ad Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-06 23:42:45 +02:00
0c6bbcc5ed Brittle and Non-movable block tags
- added a block tag non_movable conatining blocks that should not be moved with contraptions
- added a block tag for brittle blocks breaking without support
- moved obsidian from hardcoded to non_movable block tag
- moved flower pots, doors and bells from hardcoded to brittle block tag
- registrate block tagging of brittle blocks
- made immersive engineering connectors non-movable to avoid reported weird behavior
2020-07-06 23:37:44 +02:00
simibubi
fd2d496882 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-06 22:09:38 +02:00
simibubi
1907e69c35 Tilted belts
- Mechanical belts can now connect vertical shafts together
2020-07-06 22:09:35 +02:00
91b606eb46 sawing support for swamp- and endergetic expansion 2020-07-06 12:18:51 +02:00
d0d981fba5 More compat
- Made Create cobble stone variants part of forge:cobblestone
- autumnity wood compat
- changed biomes o'plenty flower crushing to milling (as it is with vanilla flowers)
2020-07-06 11:40:58 +02:00
9ca203a3a6 Recipe Compatibility
- atmospheric wood and flowers
- autumnity flowers
- blloomful wood and flowers
- botania petal milling to floral powder
- buzzier bees flowers
- druidcraft wood and flowers
- projectvibrantjourneys wood
- upgrade aquatic wood and flowers

This should resolve #389 for the most part.
2020-07-06 09:26:52 +02:00
simibubi
5cf3dde0a1 Populang hotfix
- Fixed invalid json in populated lang templates
2020-07-02 17:39:31 +02:00
simibubi
9e9dd8b507 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-07-02 17:25:37 +02:00
simibubi
cd189a5fa9 Chute Implementation
- Chutes can now transfer items
- Chutes now propagate air flow from attached fans
- Fixed a few issues with mechanical arms
- Removed unused chute models
- Implemented appropriate interactions between funnels and chutes
2020-07-02 17:23:42 +02:00
simibubi
f820e2be27 Mechanical Arm Implementation
- The arm blockitem can now be used to select inputs & outputs
- Arms now transfer items between inputs and outputs
- Arm support for Belts, Depots and Funnels
- Some safety checks in net code
- Minor refactor to NBTHelper
2020-07-01 22:02:00 +02:00
Zelophed
480dcdebed Goggle overlay offset
-added two config entries to offset the goggle overlay on x/y axis
-added a command (/create overlay [reset]) to allow editing the overlay position ingame
2020-06-29 01:07:21 +02:00
simibubi
5411bc3565 Dangle Flap Reflappified
- Belt funnels now render with animated flaps
- Extracting funnels can now be given a stack size
- Filtering now supports setting the extraction count for empty filter slots (wildcard)
2020-06-28 18:16:46 +02:00
simibubi
a2c19b21d9 Populang
- Outdated localizations will now have a populated counterpart in the generated assets, for easier maintenance
2020-06-26 01:16:17 +02:00
simibubi
f79d168bc7 Directed Funneling and Chute Funnels
- Added a funnel block variant that interacts with chutes horizontally (same item)
- Belt and Chute Funnels now have a push/pull property
- Removed Chute Ports
2020-06-25 21:38:23 +02:00
simibubi
457050ab2f Powered Funneling
- Tidied up R-Funnel texture sheet
- R-Funnels can now be powered by redstone
- Non-mounted R-Funnels are now full hopper-like blocks rather than fixtures
2020-06-25 18:17:37 +02:00
simibubi
a25f90f4ab Diagonal ChuteState
- Chutes can now connect diagonally
2020-06-24 17:25:19 +02:00
Kryppers
bffdaeb344 Update chute.png
Updated the texture for the basic chute block
2020-06-22 18:03:34 +01:00
simibubi
6d79cf16f6 Mockup Fixes 2020-06-21 11:54:27 +02:00
simibubi
5b07073e00 Logistical Mockups Part III
- Added the depot block
2020-06-20 20:02:27 +02:00
simibubi
769e585e53 Logistical Mockups Part II
- Added mockups for:
  - Packager
  - Chutes & Chute interfaces
  - Least's Reality Funnel (tm)
2020-06-20 16:10:07 +02:00
simibubi
cc6efa5aa2 Logistical Mockups Part I
- Added blockstates and TER for the Mechanical Arm
- Mechanical Arms will start a Grab Rave at random intervals
2020-06-16 12:54:24 +02:00
simibubi
dc1ccb6741 TankState
- Added blockstates and dynamic models for the fluid tank
- "Copper Pipe" -> "Fluid Pipe"
- BlockPartials are no longer an enum
2020-06-15 19:14:03 +02:00
simibubi
0a9816504b PumpState
- Added blockstates, models and TE rendering for mechanical pumps
- Removed unused pipe textures
- Removed hasStaticPart in IWrenchable as it became obsolete in 1.15
- Bumped version
2020-06-15 02:25:33 +02:00
simibubi
20de324b72 PipeState
- Implemented dynamic models and blockstates of copper pipes
2020-06-14 22:24:46 +02:00
simibubi
0d616b7a21 Refactor and Bugs
- Added missing recipe for Dark Scoria
- Refactored Cart Assembler
- Removed reinforced rails from creative tab
- Fixed blockzappers placing waterlogged blocks #350
2020-06-13 20:41:08 +02:00
gloomybanana
3689acd63d
Update zh_cn.json
add the translation of the new entries  ,and fixed the missing localization on 1.15.2version (based on BigDale's localization)
2020-06-12 15:06:38 +08:00
3417ceb4fb Cart Assembler - behaviors, railtype update and texture fixes 2020-06-11 15:26:11 +02:00
282d9d6801 Cart Assembler - States and Drops 2020-06-11 12:57:02 +02:00
63ec7f4dc7 reinforced rail: Tooltip and reworked model/hitbox to better fit minecarts 2020-06-10 20:42:23 +02:00
a57a35e867 reinforced rails 2020-06-09 23:49:39 +02:00
simibubi
285cb52894 Bug and Lang Fixes
- Patched some localization gaps from the registry wipe
- TE's with an ItemStackHandler capability are now viable for mounted storage
- Fixed pulley placing down ropes when destroyed while moving
- Fixed inconsistency with glue removal and placement
2020-06-08 18:40:21 +02:00
simibubi
752bcf06c0 Bug fixes
- Fixed encoding of generated degree symbols in lang
- Fixed pistons along x moving at inconsistent speeds, overshooting their bounds
- Fixed belts along x not moving entities
- Fixed diagonal belts along z teleporting entities miles away
- Fixed tree fertilizer not working
2020-06-08 13:34:51 +02:00
simibubi
c5e783207f Bug Hunt
- Fixed extractors looking for belt inventories too eagerly, adresses #327
- Slightly refactored Extendo Grip handlers
- Fixed missing particle texture of Extendo Grips
- Fixed crash when assembled minecarts pick up the block below their assembler
- Ploughs no longer break blocks if farmland is below them, adresses #345
- Fixed Schematic tools placing lit furnaces, adresses #342
- Super glue can no longer be removed while inbetween two blocks, adresses #341
- Added a safety check in RotationPropagation, addresses #340
2020-06-07 22:40:27 +02:00