Commit Graph

650 Commits

Author SHA1 Message Date
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
f0abbaacd7 Riding the engine
- Fixed incompatibility between seats and furnace cart contraptions
2020-07-24 19:43:33 +02:00
simibubi
80406e8782 Cleanup crew
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
tterrag
f2b8d85303 Better blaze head rotation 2020-07-23 01:34:58 -04:00
tterrag
8087d7013c Fix server crash when using heater on a spawner 2020-07-22 23:37:42 -04:00
simibubi
f5af1cd81e Merge branch 'mc1.15/dev' into mc1.15/collision 2020-07-22 19:07:33 +02:00
simibubi
f48d1f7b1c Pick me up
- Seats now pick up non-player entities when touching them while being moved
- Seats now drop off entities when being moved into a solid block
- Previously colliding entities now get moved to match their position on the placed structure on disassembly
- Contraption motion no longer gets fed into the collision response for non-minecart contraptions
- The server now gets frequent updates about client players riding a contraption, fixes instabilities with projectiles, damage and anti-fly detection
- Players can now take fall damage when colliding with contraptions
2020-07-22 18:56:48 +02:00
simibubi
9a04c51418 These are not the chunks you are looking for
- Experimental fix to disappearing entities when contraption seating reaches across chunk boundaries on save
2020-07-22 14:12:19 +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
d3e7b23d6e Seats, part I 2020-07-20 01:19:20 +02:00
simibubi
5ebb44f50b Projected stepheight
- The oriented collision response now accounts for an entities' step height to automatically climb blocks such as stairs or slabs
2020-07-19 20:54:29 +02:00
Zelophed
2a3da7e4d0 he do be munching tho
-added sounds to the runData again
2020-07-19 17:08:20 +02:00
simibubi
19ca9dd7d6 Fix build and dist issues
- Fixed javac not inferring type vars correctly
- Fixed client particle classes being loaded on server dist
2020-07-19 13:53:27 +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
a009540190 CubeParticle hotfix
- Switched to additive cube particle mode
- Fixed cube particles not rendering properly with other entities in frame
2020-07-19 00:50:03 +02: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
simibubi
53a58def49 Contact points and Friction
- Entities are now moved with the relative motion of their contact point
2020-07-15 15:01:59 +02: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
d4f0743522 fix build issue 2020-07-14 17:46:26 +02:00
ffb1b17626 reworked blaze heater heating system (again) 2020-07-14 17:23:07 +02:00
simibubi
ebc2944788 Robust entry collisions
- Collision separation now supports motion sweeping in order to avoid tunnelling when entities drop onto contraptions from a greater height
- Further improved the collision response
- Entities can no longer be clipped into solid walls by the collision response
2020-07-14 16:58:10 +02:00
376b6cc851 blaze heater lighting (moved heat level to block state) 2020-07-14 16:24:40 +02:00
0580318b38 new heater fuel and fueling system 2020-07-14 15:54:02 +02:00
7404972cf6 resolved culling issues + crude heater voxel shape 2020-07-14 10:40:19 +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
simibubi
85d10a7ce5 Seat lang merge 2020-07-12 23:57:42 +02:00
simibubi
c58310b293 Actually playable
- Fixed some left-over math bugs
- Greatly improved contraption-player collision response, especially with rotating structures
2020-07-12 23:57:27 +02:00
f9691da8c8 update forge to 31.2.31 2020-07-12 15:33:41 +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