Commit Graph

344 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
simibubi
16705c5cb5 A flock of fluids
- Added Fluids for chocolate, honey, milk and tea
2020-12-03 20:41:55 +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
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
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
59e377c7ef merge recent changes 2020-11-30 09:48:38 +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
0231b32866 Someone get those damn mine carts under control!! 2020-11-28 21:12:31 +01:00
Kryppers
4d564464c5 Cu Later!
Updated copper oxidisation.
2020-11-27 22:39:06 +00:00
Daniel Amberson
b24648b431 i foRGOT ONE
A
2020-11-27 10:48:38 -06: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
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +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
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
5abfc15e9e Destroyer of Lakes
- Added the hose pulley
- Added creative tanks
- Fixed sails not getting consumed when placed against each other
- Items can now be inserted onto belts regardless of it moving or not
- Fixed item duplication on stopped belts
- Refactored fluid block rendering in JEI
- Reworked model of the schematic table
2020-10-30 02:16:08 +01:00
Lucas Barcellos
c63d0980ed Update assets for Cinderflour and Blaze Cake 2020-10-28 22:21:03 -03:00
simibubi
b14664d45f Windmill is Bearing is Clockwork
- Fixed Mechanical Press animation de-sync between server and client
- The press no longer requires a redstone signal to activate on in-world items
- Fixed spouts and basin trying to create potion buckets
- The Mechanical bearing can no longer generate force from wind
- Added the windmill bearing
- Windmill bearings can be configured to rotate counter-clockwise
- Added Sail Frames and Sails
- Sails can by dyed in-world
- Sails negate fall damage
- Sails attach themselves to blocks and do not require a sticky surface or chassis
- Clockwork bearings can now be configured to switch minute and hour hand aswell as use a 24 hour cycle
- Fixed tunnels with windows occluding block faces directly behind them
- Fixed item model of the mechanical saw
2020-10-22 00:50:17 +02:00
simibubi
df252b3e30 Catching up
- remapped seat tooltips
- remapped outdated lang keys
- applied changes of #395 to 1.15
- Fixed Schematic hotbar overlay sometimes drawing on top of the item icon
- Fixed mechanical arm lighting and render bounds issues
2020-10-20 13:42:16 +02:00
simibubi
eea9811053
Merge pull request #460 from gamrguy/improved-saws
Improved mechanical saw rendering and contraptions
2020-10-20 12:47:37 +02:00
Kryppers
e54cdf1c96 Lang file Tweaks 2020-10-20 00:10:19 +01:00
simibubi
b7bed44a61 Basic Brewing
- Refactored JEI plugin to use a builder for categories
- The mixer can now process vanilla potion recipes
- JEI support for fluid potion mixing
- Refined some categories to not show obsolete information
- Compacting and automatic vanilla packing are now in separate tabs
- Fluids can now be manually picked up from a basin
- Basins and Spouts can now extract from and fill vanilla potion items
- Improved the filtering for fluid tests, such as the basin recipe and smart pipes
- Fixed CombinedTankWrapper losing nbt data of transferred fluidstacks
2020-10-19 22:07:05 +02:00
simibubi
dd95096bfa Smart Fluid Pipes
- Added craftable pipes with filtering capabilities
- Added missing recipe for the Portable Storage Interface
2020-10-17 18:20:05 +02:00
simibubi
62434fd564 That's hot
- Better JEI documentation of heat levels
- Remapped / Adjusted a few tooltips
- Fixed fan processing on item entities happening on both logical sides
2020-10-14 20:52:38 +02:00
Colman Davenport
a28b6bbdc3 Overhaul mechanical saw rendering
- Saws no longer use "RUNNING" blockstate
- Sawblade animates based on input speed
- Saws properly stop animating when inactive
2020-10-12 23:25:35 -04:00
simibubi
afa94c3e77 Blazier updates
- Fixed some sync & block update issues with blaziers
- Changed the fuel pellet item
- JEI can now display fluid in- and outputs of basin recipes
2020-10-12 21:55:09 +02:00
simibubi
378164b8b9 More unfinished basin business
- Fixed players flailing their limbs around while standing still on a moving contraption
- Attempted to reduce drag of remote player positions while on a contraption
- Contraptions no longer log out with the player riding them
- Attribute filters are now made of brass
- Added the ability to disable auto-compat with vanilla recipe types in the configs
- Added a recipe type for custom basin/press compacting
- Basins can now process items and liquids in recipes
- Input items/fluids of a basin can now be extracted or reused in further processing
- A basin diagonally below another basin with collect outputs of recipes processed in the top basin for ease of automation
- (Temporary debug recipes)
2020-10-06 20:43:13 +02:00
simibubi
b14e94929c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-02 14:41:49 +02:00
simibubi
334bde9de5 Quality
- Visual rework of all active UIs
- Fixed large scale renderers such as belts, cannons, pulleys to disappear when partially out of frame
- Schematic and Quill now has the ability to convert a selection to a readied schematic instantly
- Moved option input of cart assemblers to side faces
- Fixed crash when attempting to smelt items on belts/depots
- Stockpile switches can now be inverted
- Fixed stockpile switches not dynamically updating gui indicators frequently enough
- Tanks can no longer be directly interacted with in survival mode
- Sequenced gearshifts now emit a comparator signal based on their current instruction index
- The Piston instruction for sequencers can now accept distances up to 128m
- Fixed some rendering inconsistencies with symmetry mirrors
- Reworked symmetry mirror models to match the tool better
- Attribute filters can now add inverted conditions to the list
- Added the attribute "can be crushed"
- Made the schematicannon interface a little less confusing
- Fixed launched items of the schematicannon rendering warped
2020-10-02 14:28:48 +02:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
simibubi
6e285e2f8b Valves and Valve handles
- Added a straight pipe variant to cut flows using rotational input
- Added a slower more precise variant of the hand crank
- Basins now render their contained fluids
2020-09-25 17:22:16 +02:00
simibubi
d9d5e60606 Workstation transfer, Part I
- Intermediate changes, probably doesn't even compile
2020-09-24 13:39:12 +02:00
simibubi
aef451e3bf Logistics' final stretch, Part II
- Belt observer -> Content observer
- Content observers can now monitor any inventory and funnel transactions
- Stockpile switches no longer only access slots exposed to a specific side of an inventory
- Stockpile switches can now take a filter
2020-09-20 21:34:36 +02:00
simibubi
990d80412e Logistics' final stretch, Part I
- Brass tunnels once again have the ability to synchronize inputs among a chain
- Mechanical arms now have a range limitation
- Mechanical arms now wait with initialization until their area is fully loaded
- Chutes no longer ignore the direction of an attached fans air flow
- Chutes now render particles indicating their movement direction
- Chutes can now pull items up from belts or off the ground
- Fixed item model of shadow casing
- Fixed invisible quads under funnels when no casing is applied to the belt
- Belt mounted funnels can now be perpendicular to the belt theyre on
- Funnels can now transpose items like a hopper when facing down
2020-09-19 15:19:22 +02:00
simibubi
f58a7c8482 Fun with funnels
- Reworked funnel assets
- Andesite funnels can now be controlled via redstone input
- Re-introduced creative mounted storage
2020-09-14 21:10:38 +02:00
simibubi
03cf441674 Distribution modes for tunnels
- Item distribution across belts using brass tunnels can now be configured with a wrench
- Added new icons for the distribution options of arms and tunnels
- Removed obsolete code
- Fixed some weirdness with creative crates and funnels
2020-09-13 22:00:11 +02:00
simibubi
651e06a70a Down the Refactor rabbit hole
- Reworked tileentity behaviours for inventory interaction
- Deployers no longer actively pull items from other inventories
- Some more work on basins
- Added a new inventory type wrapping an itemstack handler that automatically syncs the tile entity. It also implements IInventory for recipe shenanigans
- Held items of a deployer can now only be extracted by other blocks if it does not match the filter
- Fixed excess items not able to be extracted from deployers
- Removed some things
- Funnels no longer actively transpose items between chutes and inventories unless they are vertical
- Chutes can now active pull and insert items from/to inventories above/below them
2020-09-13 00:59:14 +02:00
Kryppers
bf00406cad Mind your fingers
Replaced the terrifying wooden saw bed with something more practical.
2020-09-12 21:46:54 +01:00
simibubi
5a7c09aa25 Filtered Basin Processing
- Basins can now be assigned a filter to narrow down the range of recipes that can be applied to its ingredients
- Some random asset updates
2020-09-04 15:16:07 +02:00
simibubi
2855a22221 Grunthog Day
- Migrated Shaped and Shapeless crafting recipes to generated
- Added the reworked spout asset by Kryppers
2020-08-31 12:49:36 +02:00
simibubi
84079c769e Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-08-28 22:45:31 +02:00
simibubi
230a6cf848 Sploosh
- Added the Spout
- Added Safety check to the drain cap rendering condition
Highly unstable
2020-08-28 22:45:27 +02:00
Daniel Amberson
c64d0fd98e more corrections
blockbench also likes putting "create:" in front of vanilla textures

also log waterwheel spokes!
2020-08-28 12:20:07 -05:00
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
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
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
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
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
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
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
0580318b38 new heater fuel and fueling system 2020-07-14 15:54:02 +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
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
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
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
a57a35e867 reinforced rails 2020-06-09 23:49:39 +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
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
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
c53f9c2079 Contraption actors and blockzapper screen
- Fixed harvesters and drill animating incorrectly on contraptions
- Ported blockzapper and worldshaper screen
2020-05-28 13:37:15 +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
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
ff1f7bd207 Spiffy creative motor
- Motors can now face any direction
- Reworked motor model
- Ported motor to registrate
2020-05-19 01:07:45 +02:00
simibubi
c698aec5d4 Generating complex blockstates
- Added utility for outsourcing blockstate generators into dedicated classes
- Ported Encased belt and Adjustable Pulley
- Updated Forge
2020-05-18 22:01:09 +02:00
simibubi
9c96ee8bb8 Removed Symmetry Particles from block registry
- Fixed fluid rendering in fan recipe JEI
- Made symmetry mirror models partials instead of blockstates
- Ported symmetry wand GUI Screen
2020-05-18 15:51:24 +02:00
simibubi
fb72a686e7 Ported in-world interfaces
- Outlines now support shading/normals
- Refactored Value boxes to use the outliner system
- Ported scrolloption, filter and frequency slot rendering
2020-05-16 17:51:29 +02:00
simibubi
8212d39d95 Ported superglue entityrenderer 2020-05-16 09:57:06 +02:00
simibubi
78b3d2c47e Goodbye, tools
- Removed shadow steel, rose quartz and blazing toolsets
- Removed some other unused assets
- Fixed limesand not registering an item
2020-05-15 02:05:01 +02:00
simibubi
12e0e55b0f Generating Stairs, Slabs and Walls
- All palette variants now have auto-generated stairs, slabs and walls for certain patterns
- Layered variant types have connected textures again
- Centralized all SpriteShifts
2020-05-15 01:23:27 +02:00
simibubi
a070792248 Generating Glass and Window Panes
- Re-implemented framed, tiled glass panes and window panes in the palettes registrate
2020-05-14 19:06:40 +02:00
simibubi
deb03d10de Ported window blocks
- window and glass blocks entered the registrate
- updated palette textures
- removed windowlogging
- removed cocoa logs
2020-05-14 01:23:15 +02:00
simibubi
7536e22eed Connected Textures and Registrate
- CT behaviour is no longer tied to blocks implementing interfaces
- Custom models and connected textures can now be assigned in a custom blockbuider
- Ported framed glass to Palette Registrate
2020-05-13 21:56:46 +02:00
simibubi
bf57058e4e A new home for palette blocks
- Set up datagen for basic palette models and blockstates
- Overgrown blocks now follow foliage colour
- Paved blocks now connect vertically
2020-05-13 01:11:07 +02:00
simibubi
65853c9da0 Creative Crate Revival
- The creative crate is back on the menu
- Schematicannons with creative crates no longer require gunpowder to operate
- Creative crates can now be used for infinite item supply and voiding
- Added a few more advancements
2020-05-07 19:52:36 +02:00
simibubi
6c3c0600d3 Rebooting Advancements
- Reworked basic advancement tree, to be continued
- Removed unused trigger and damage source for sandpaper
- Added some new crate assets
2020-05-06 20:24:04 +02:00
simibubi
ef541493c5 Asset tweak
- Made new belt sprite less aggressive
2020-05-05 20:36:42 +02:00
simibubi
c4513020df Schematics and Entities
- Fixed sidedness issue with glue effect packets
- Fixed duplication issue with Schematic tables
- Schematics can now include entities
- Schematicannons can now print:
    - superglue
    - (filled) item frames
    - (equipped) armor stands
    - end crystals
    - boats and minecarts
    - paintings
- Special blocks/entities placed by a schematicannon can now specify custom item requirements (used currently for belts & superglue)
- Fixed superglue not being rotated/mirrored correctly
2020-05-05 20:21:22 +02:00
simibubi
75638b7c8d Pocket Carts
- Minecarts with mounted contraptions can now be picked up as an item
- Furnace Minecarts can now be used in the cart assembler
- Fixed superglue not re-appearing when moved in piston contraptions
- Fixed deployer not being able to interact with non-living entities
- Fixed Schematic deploy tool outline not rendering at the right location for certain boundary sizes
- Fixed leaking GL texture parameters from outline rendering
- Added Italian localization
- Fixed file extension of Japanese localization
2020-04-30 16:45:35 +02:00
simibubi
885791f878 Cart Rotation Lock
- Minecart assemblers can now be configured to 3 different rotation modes
2020-04-29 23:32:17 +02:00
simibubi
a97418e784 Better Schematics
- Visual rework to Schematic items and their interface
- Written Schematics can now be re-used in Schematic Tables
- Schematic and Quill selection is now smoother and more precise
- Schematics no longer re-render their preview every time they are re-positioned
- Schematic tools now move, rotate or flip the schematic more smoothly
- Schematic tools now render the new cuboid outlines rather than plain GL lines
- Fixed Schematics not rendering TileEntities in their preview
- Fixed inconsistent shifting when rotating Schematics with an "odd by even" size
- Fixed typo in Mechanical Press tooltip
2020-04-27 14:04:06 +02:00
simibubi
c62d356f9b Superglue
- Added superglue, an alternative to chassis blocks
- Added some random safety checks
- Fixed some more bad gl states left by event handlers
2020-04-20 23:27:34 +02:00
simibubi
db8e52be2e Bugs & Refactors
- Added new selection/outline particles for use in place of bounding box rendering
- Refactored JEI categories
- Slots for chance outputs now have a slighly different appearance in JEI
- Redstone links no longer cause a redstone update when loaded in
- Redstone links no longer mess up windmill bearings on chunk reload
- Fixed redstone links not working properly after movement in a contraption
- Filter output amounts can no longer be increased beyond the stack limit
- Chassis range visualization now uses the new outline particle
- Kinetic networks are now aware of movement, such as NBT-item placement, schematic placement and other means of tileentity movement and will reset/reconnect
- Fixed pistons/bearings/etc not being movable by chassis
- Fixed pistons/bearings/etc moving a clone of themselves when attached to the initial block
- Fixed pistons/bearings/etc stopping or losing their structure when loaded incorrecly
- Pulleys can now be moved while extended, moving attached ropes and their own attached structure with them
- Brittle blocks such as ladders/torches/etc can no longer be moved unless their attached block is moved
- Fixed mechanical pistons messing up their kinetic information when changing into a different extension state.
- Fixed misplaced client code introduced by a ScreenOpener hotfix
- Fixed inconsistent belt initialization when belts are placed by schematics or structures, causing them to break at random
- Clutches and Gearshifts now await their turn to re-attach when changed, allowing multiple to be used in a network and swapped within one tick without causing components to break.
- Fixed flexcrate interface crashing if the block gets removed while open
- Some additions/modifications in texture assets
- Pistons no longer get blocked by their push limit if the blocks pushed are attached to each other
2020-04-16 20:46:15 +02:00
simibubi
c3f781b762 The Millstone
- Added Millstone
- Added Milling recipe type
- Crushing wheels can apply milling recipes
- Added a command for clearing the buffer cache
- Any cog-containing machine can now connect to large cogwheels
- Added French localization by Kiro
- Removed unused lang entries
2020-03-26 23:03:56 +01:00
simibubi
f9b9659bc6 Bugs, Recipes and Storage Blocks
- Added Zinc and Brass Block
- Added compat for mechanical Saw with BoP's logs
- Fixed Crafters and Mixers not handling container items properly
- Fixed Shafts not dropping when breaking a belt segment with pulley
- Added missing loot table for copper blocks and shingles
2020-03-23 17:04:09 +01:00
simibubi
14e053fafd Sequenced Gearshift
- Added Sequenced Gearshifts
- Fixed custom swords breaking blocks when held in creative mode
- Fixed belts cancelling flight when touched
- Fixed Entities being blocked by contraption boundaries when moved on belts
- Fixed Flexpeater going funky when edited while active
- Fixed Links not firing when placed into a powered location
2020-03-11 21:40:55 +01:00
simibubi
59e9a76e49 Special Tool Tiers
- Added Blazing, Shadow Steel and Gilded Rose Quartz tools with individual traits
2020-03-09 17:46:04 +01:00
simibubi
c3278c91c8 Handheld Worldshaper
- Fixed crash caused by suicidal deployers
- Fixed blockzapper rendering inconsistencies before a block is selected
- Added the Handheld Worldshaper with 3 brushes and 6 modes
- Entities on belts no longer get blocked by entities they are being ridden by
2020-03-05 19:52:10 +01:00
simibubi
068b7c0c37 Rotated Disassembly & Powered Latch
- Chassis blocks now visualize their range blocks when selected with a wrench
- Fixed Bearings and other actors selecting moved blocks as if they were being pushed in a direction
- Fixed Radial chassis not connecting to each other consistently
- Added Powered Latch and Powered Toggle Latch (Redstone circuits)
- Window-logging now works with modded glass panes, that do not have the tag on their item, but the block only
- Chassis can now be edited in bulk by holding down Ctrl
- Chained block movement no longer marks blocks for movement if they are in front of a block breaker
- Making a chassis sticky no longer uses up slime balls
- Chassis can now be made sticky on all sides if a sticky side is clicked once again
- Fixed linear chassis picking up blocks attached to other chassis' lines, even if not sticky
- Fixed horizontal rotation and mirroring of chassis blocks and their sticky sides
- Structures rotated in a Contraption now try to rotate themselves and their blocks toward the nearest axis-alinged direction when disassembled
- Fans no longer shoot testing rays if the target block shape is completely filled or empty (trivial case)
- Fans can now blow through iron bars again
- Fixed crash when adjusting motors
- Fixed missing icons in blockzapper & schematicannon interface
- Reworked the drill model
- Added more tags to #windowable
- Leather horse armor no longer crushes into iron nuggets
2020-02-27 18:09:41 +01:00
simibubi
c7e8698ce8 Inhibiting Contraption Placement
- Pistons, Bearings and Pulleys now have a ScrollInput for selecting when to place moved structures back into the world
- Added copper blocks with oxidation effect
- Pistons and Pulleys no longer move inconsistently when disassembled and assembled at intermediate offsets
2020-02-19 14:08:49 +01:00
simibubi
fb046ddfb7 Refactor in-world Scrollinputs
- Reworked Scollable inputs on blocks to use a unified TE behaviour & generic value box rendering
2020-02-18 15:08:45 +01:00
simibubi
81a2e314bc Contraption bugs and balance
- Added a config option to disable the stress/torque mechanic entirely
- Water wheel speed is halved and now configurable
- Water wheels now validate their current speed from time to time
- Fixed windmill bearings counting their sail blocks incorrectly
- Fixed windmill bearings not assembling when placed in a powered block position
- Fixed Contraption controllers not removing their entity reference on the client when disassembled
- Bearings no longer start rotating when no block was found
- Contraptions no longer move unbreakable blocks
- Pistons no longer assemble the whole line of blocks when retracting
- Non-sticky pistons no longer pull blocks back when assembled
- Pulley no longer assembles when the structure by itself is immovable
- Fixed pistons applying reversed motion in some orientations
- Fixed piston contraptions not including the poles into its render bounds
- Fixed Contraptions not culling backfaces when rendered
- Translucent blocks now get moved to the back of the render order in contraptions, fixes hidden block faces between translucent and non-translucent blocks
- Fixed Contraptions being movable through water, fans and other means of applying motion to entities.
- Belt segments can no longer be rotated by a wrench
- Hand cranks are now gated behind brass and sheet production
2020-02-16 18:26:06 +01:00