Commit Graph

179 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
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
217138255e Tanks, Obama
- Reworked fluid tanks to incorporate new assets and functionality
2020-07-19 00:22:14 +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
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
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
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
simibubi
1907e69c35 Tilted belts
- Mechanical belts can now connect vertical shafts together
2020-07-06 22:09:35 +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
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
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
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
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
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
simibubi
34a16b05bf In memory of Gilded Rose Quartz
- Added the Extendo Grip
- Cart assemblers now center a held minecart on their position
- Fixed Minecart contraptions facing backwards upon assembly
2020-06-06 22:36:58 +02:00
b70343b32c Cart Assemblers now stop disassembeled minecarts and send assembled minecarts on their way automatically. Power to assemble cart. 2020-06-06 17:19:42 +02:00
simibubi
e669bb3b27 Added Nixie Tubes 2020-06-05 23:26:22 +02:00
simibubi
cfdc9d0a5e Directional sources of rotation
- Fixed gearbox pretending to be a deployer
- Fixed reversed rendering in the furnace engine TER
- Motors, fans, flywheels and handcranks now reverse their rotation when facing in negative axisdirections. Addresses #236
- Cart assemblers no longer auto-attach to blocks on their sides (top only)
2020-06-04 21:02:29 +02:00
simibubi
82a2d128f1 Ported ISTERs
- Removed temporary lang partial with entity names
- Fixed and Refactored the item renderers of the Wrench, Blockzappers, Worldshapers, Symmetry Wand and Deforester
- Tweaked blockzapper beam rendering to look less clunky
- Fixed selection of zapper tools not showing after they had been dual-wielded
2020-06-04 15:04:49 +02:00
simibubi
daee93dc48 Stone variant recipes
- Setup automated recipes for stone palette blocks and their stairs/slabs/etc
- Fixed datagen putting air blocks as drops for attached logistical blocks
- Fixed recipes and lang entries using outdated registry names
- Fixed kinetic blocks appearing twice in the main creative tab
2020-05-31 19:17:00 +02:00
simibubi
3d68bec18a Item registrates, and more porty
- All Items are now using registrate
- Blockzapper now renders an outline around its affected area
- Ported rainbow debug ™️
- Reworked the custom item model/renderer system
- Schematics now preview their structure again
- SuperByteBuffers now support being rendered into non-BufferBuilders
2020-05-28 01:29:26 +02:00
simibubi
f9fc00855a Reversed Simi's reverse-rendering
- Fixed all TERs that had their transformations backwards
- Fixed contraptions not rendering tileentities when not near world origin
- Fixed Schematic table crashing on upload
- Made more kinetic blocks non-opaque
2020-05-25 23:09:36 +02:00
simibubi
e9c26eed0a ColorRegistrate
- Added support for Block & ItemColors in CreateRegistrate
- Updated forge and removed obsolete warning suppressions
- Fixed mossy & overgrown block items not having their foliage layer coloured
2020-05-24 03:12:18 +02:00
simibubi
785c79786d Get registrated, Part II
- Set up datagen and registrate chains for all remaining blocks
2020-05-22 20:02:07 +02:00
simibubi
8ab9118de2 Get registrated
- Set up datagen and registrate chains for all remaining blocks from the contraptions section
2020-05-21 00:15:02 +02:00
simibubi
b773ba697f Generating water wheels and fans
- Kinetic TER now renders animated partials in the correct layer
- Ported Water wheel and Encased Fan to registrate
2020-05-19 16:41:54 +02:00