Commit Graph

365 Commits

Author SHA1 Message Date
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04: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
521ce8a766 port recent changes 2020-10-23 19:01:25 +02:00
simibubi
b2cd378b52 Back in the early game
- Hand cranks can now be made without the need of brass
- Fixed tooltip referrals
- Crafters can no longer be covered when while they are holding an item
- Pushed some numbers around
2020-10-22 01:48:24 +02: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
12e5b95157 Yet more TextComponent nonsense
1.16 just keeps on giving
2020-10-20 21:03:43 +02:00
simibubi
41148a5e39 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:02:50 +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
Bob Dole
b30d3369cd Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-19 23:22:24 -04: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
Bob Dole
21e19bef9f Merge branch 'mc1.15/dev' into mc1.16/dev
- Resolved merge conflicts
2020-10-18 00:22:25 -04: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
Zelophed
49ed619a79 ForgeCraft Playtesting, Part III-b
- fix blockzapper upgrade category
- fix goggle item not displaying properly in the goggle-overlay and its config screen
- fix items in guis occluding certain tooltips (again)
2020-10-17 04:29:00 +02:00
c9e2f8b05e Deforester works on slime saplings 2020-10-16 11:14:47 +02:00
simibubi
db2b8dd197 ForgeCraft Playtesting, Part II
- Fixed server dist crash in entity belt movement
- Fixed client crash when saving a schematic without giving it a name
2020-10-14 21:15:19 +02:00
simibubi
69cbfff8ed Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-14 21:06:46 +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
simibubi
9b5707cba6 ForgeCraft Playtesting, Part I
- Fixed various rendering in JEI and UIs
- Fixed oxidized blocks not allowing to be harvested
- Fixed missing titles and tooltips in JEI and other UIs
2020-10-13 19:56:12 +02:00
simibubi
442d89e09e Port Changes to 1.16, Fix server launch 2020-10-12 22:16:06 +02:00
simibubi
cbeb5dc649 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 22:15:32 +02: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
be8924a154 Port changes to 1.16 2020-10-12 16:25:57 +02:00
simibubi
df5008e7fd Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 16:25:46 +02:00
simibubi
9852d84fb8 More logistical errands
- Arms can no longer feed random junk to a jukebox
- Arms are no longer oblivious to hot-swapped blocks in its target areas
- Arms can now directly extract from and insert to Deployers and Crafters
- Arms can now feed blaze burners
- Fixed brass funnels deleting items inserted into a full or stalled inventory
- Fixed brass funnels in hopper mode not showing amounts on filters when transferring between server-only inventories
- Arms & Deployers can now be paused using a redstone signal; stopping them after their next completed cycle
- Fixed zapper tools not applying changes when the screen is closed using the confirm button
- Reorganized valve handle registration
- Added more preliminary recipes
2020-10-12 16:03:26 +02:00
131669c9ff Temporarily fix fluid tag serialization 2020-10-11 12:38:50 +02:00
3e3b0dad6e port changes to 1.16 2020-10-10 22:40:59 +02:00
1a4814e724 merge mc1.15/dev into mc1.16/dev 2020-10-10 21:46:40 +02:00
simibubi
22ed233969 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-10 21:15:48 +02:00
simibubi
f3deb8ba85 Tilted Trains
- The collision response now (semi)-supports yaw-pitch combined rotations of contraptions
- Attempted collision and rendering of contraption couplings moving up and downhill
- Fixed sychronization issues of a mounted contraptions' initial orientation
- Contraption couplings no longer render the virtual coupling connection
- Entities can no longer mount the cart connected by another carts' contraption
- Contraption coupligs no longer rotate backwards when opposite couplings are added onto it
- Minecarts no longer deadlock each other when one of them had stalled due to an unloaded coupling end
- Cart assemblers only disassemble coupling contraptions if both carts are within an inactive cart assembler
- Fixed interactions between coupling contraptions and furnace/chest minecart invs
2020-10-10 21:12:28 +02:00
88b8e7744f Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java
2020-10-10 19:48:06 +02:00
cb135df649 Configurable hunger games 2020-10-10 18:13:40 +02:00
simibubi
3956875334 The Coupling Capability
- Fixed concurrency / race condition issues with contraptions loading in during a collision cycle
- Reworked implementation model of minecart tracking and couplings
- Coupling items now get consumed when used in survival mode
- Added some player feedback when couplings cannot be created
- Fixed couplings disappearing on the client due to sync issues
- Wrenches can now remove minecarts in one hit
- Wrenches can now be used to remove couplings from minecarts
- Cart assemblers now attach themselves to the block above, no longer requiring active "sticky-ness" of the contraption towards it
- Minecarts can no longer be moved while a contraption is stalling them
2020-10-08 20:13:17 +02:00
36a96d35e3 fix some rendering to use matrix stacks 2020-10-07 22:32:03 +02:00
simibubi
699dc7bb5c Issues with Nested Config groups
- Fixed prefix "kinetics" added to unrelated subsequent config keys due to inconsistent push/pop
- Removed obsolete config values
2020-10-07 11:46:55 +02:00
b9476b58ce bare basin business, but 1.16 2020-10-06 21:42:31 +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
5401d96942 Fixed item tooltips 2020-10-06 20:11:58 +02:00
e8c458f2ad Fix even more text components, now in tooltips 2020-10-06 15:54:16 +02:00
0d972e144f Fix some more text components 2020-10-06 12:21:13 +02:00
33b8d2bd85 Fix matrix stack rotations 2020-10-04 15:39:32 +02:00
eda8bfd0a1 Fixed crash on pressing alt key on schematic screen 2020-10-04 14:16:05 +02:00
5993c30a3e fix contraption crashing the renderer 2020-10-04 13:48:30 +02:00
fdf9fdcd78 Fixed some text component stuff i messed up earlier 2020-10-04 10:35:58 +02:00
simibubi
bc4418a929 Port recent changes to compile 2020-10-04 01:59:51 +02:00
31e35d060f fixed merge conflicts 2020-10-04 01:08:13 +02:00
tterrag
e5179598e3 Get things running, fix forge/mc dependencies and extendo grip 2020-10-03 17:12:32 -04:00
tterrag
3be810a9eb Yet more porting, bodge to let SchematicWorld implement IServerWorld 2020-10-03 16:27:09 -04: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
simibubi
5c56adaeaa Midnight bugs
- Fixed deployers not firing any right-click actions
- Fixed basin renderer crashing outside of dev env
- Fixed some lighting and flickering on psis
2020-09-26 00:59:43 +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