Commit Graph

606 Commits

Author SHA1 Message Date
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
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
02450bd2f7 More recipe Serializer changes
- added Interface IExtendedProcessingRecipe supporting requiredHeat, fluid inputs and fluid outputs
- set Mixing recipes to use the extended serializer in AllRecipeTypes
- removed constructor parameters specifying fluid usage in recipes that do not support fluids (and changed the ConversionRecipe JEI support class back)
- cleaned up annotations, ordered AllRecipeType enum values and imports, reformatted recipe code
2020-07-11 16:18:17 +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
a73919357b fluid reading for the processing recipes and its serializer 2020-07-10 22:46:11 +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
3902569cbd Fix another kinetic loop when removing shafts from a belt segment 2020-07-10 12:49:24 +02:00
simibubi
cf80822024 Merge branch 'mc1.15/v0.2.x' into mc1.15/dev 2020-07-10 12:47:36 +02:00
simibubi
16e08a0693 Distribu-tunnel
- Fixed dynamic Mechanical Arm parts not being lit correctly
- Fixed Mechanical Arm not always initializing interaction points on the client
- Belt tunnels now create side-openings for belt-like blocks such as the depot
- Belt tunnels no longer create flaps when there is a belt funnel connected to that side
- Brass tunnels can now distribute items among their output sides and other connected tunnels, taking into account their sided filtering
2020-07-09 21:55:14 +02:00
simibubi
26112ddc93 Fix build issues
- Not sure why but this seems to have worked
2020-07-09 01:28:14 +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
f9fe47eea5 Merge branch 'basin fluid support' into mc1.15/dev 2020-07-08 18:29:35 +02:00
3bcdac6080 Crude basin fluid support
- basin can now store fluid
- fluid stored in basin will be bundled together with item in a MultiIngredientTypeList supporting both items and fluids
2020-07-08 18:29:02 +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
Prusias
2d04c87865 Fixes issue 388, When placing a casing or shaft on a active belt it creates a looping power source. This is avoided by using KineticTileEntity.switchToBlockState, which safely modifies the kinetic network. 2020-07-07 11:04:25 +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
a0b4b5fa93 Fix AllTags namespace import 2020-07-06 12:24:03 +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
8ddf3fabba Merge branch 'non_player_kinetic_placement_fix' into mc1.15/dev 2020-07-04 14:29:38 +02:00
ff32c6c6ae fix null player crashes 2020-07-04 14:26:37 +02:00
Zelophed
957f9355b7 Display Arm Interaction Points
- placed mechanical arms will show their in/out puts if you look at them while holding a wrench
2020-07-03 23:56:50 +02:00
simibubi
5cf3dde0a1 Populang hotfix
- Fixed invalid json in populated lang templates
2020-07-02 17:39:31 +02:00
simibubi
614059a3cc Additional lang keys from prior merge 2020-07-02 17:26:12 +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
ce1c5d8697 Belt funnel & World funnel implementation
- Funnels on belts can now extract and insert items according to their setting and filter
- Funnels can now push/pull items to/from a depot
- Fixed creative crates not marking their inventory as removed when destroyed
- Funnels can now pick up items colliding with their front face
- When holding a funnel the game will now always prefer placement over block interaction
- Fixed items not able to be held in place by tunnels
2020-06-28 13:31:11 +02:00
simibubi
f7ad748a09 Depot Implementation and Interaction
- Depots can now hold on to items similarly to belts
- Item processing such as the press and bulk smelting now targets a Processing TE behaviour, rather than the belt only
- The press and similar processing can no longer commence whenever there is a block with a collision shape between item and machine
- Implemented item processing for Depots
- Items can seamlessly traverse from belts to depots
2020-06-27 15:20:22 +02:00
simibubi
9fe1d85199 Reworked belt processing and interfacing
- Removed the IBeltAttachment system
- Item processing on belts is now a TE behaviour
- Added TE behaviour for allowing belts (and similar) to directly insert items
- Massive refactor to the Belts' inventory
- Fixed fast moving items missing their processing step
- Saws, Basins, Crushing Wheels, Belts and Crafters now interact through the new behaviour rather than hard-coded interactions
- Fixed items (visually) disappearing on saws while queueing up
- Items on belts now back up a little further away from the end of the belt
2020-06-26 21:38:10 +02:00
simibubi
69dd19cd58 Filtered Funneling
- Added filtering behaviour and in-world slots to new funnel blocks
- Filtering behaviour now supports slots active on multiple sides
- Funnels no longer wipe their TE when changing state
- Fixed VoxelShape for extended belt funnels
2020-06-26 12:35:24 +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
a13d9fcede CollideCarts
- Contraptions now run their collision from a separate ticking hook
- Minecart mounted contraptions now run the collision algorithm
2020-06-22 10:58:02 +02: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
9af22b5578 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-06-20 16:10:11 +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
8ab1a6d59c fix piston head not dropping 2020-06-20 13:18:21 +02:00
b5afa41152 simplify duplicate tagging 2020-06-19 23:01:13 +02:00
a6fab28722 fix waterlogged blockstate to not be part of blockstate json files 2020-06-19 21:49:49 +02:00
38dbed2518 Tagging Changes
- Copper, Brass and Zinc blocks can now be used as beacon base block
- Copper, Brass and Zinc can now be used to activate a beacon
- Create ingots are now listed under the forge:ingots tag (not only forge:ingots/type)
- Create nuggets are now listed under the forge:nuggets tag (not only forge:nuggets/type)
- Create plates are now listed under the forge:plates tag (not only forge:plates/type)
- Updated registrate to support multiple tags
2020-06-19 18:37:11 +02:00
simibubi
d9105b4e60 Collision refinements
- Fixed reversed matrices and swapped rotation axes passed into the collision resolver
- Temporarily reduced collision manifold generation to collisions that are NOT edge-to-edge collisions.
- Enabled collision response for clockwork bearings
2020-06-19 14:14:42 +02:00
444dc4c903 Cart Assembler sounds (placing and rail replace) 2020-06-18 09:06:31 +02:00
197834c36c fix pipe connections and tank hitbox (again) 2020-06-18 07:57:20 +02:00
c51e2abf48 water logging and contraptions 2020-06-17 23:16:27 +02:00