Commit Graph

892 Commits

Author SHA1 Message Date
d16f41ccfb Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
2020-11-17 14:37:47 +01:00
8dff92e0bf Added chest minecart contraption item and wrenching of chest minecart contraptions 2020-11-17 14:35:07 +01:00
ugudango
3635611365 Casted ByteBuffer to Buffer in multiple places, for better backwards compatibility. 2020-11-17 01:46:27 +02:00
1a7bf39fc1 Add copper zinc and brass as beacon base back in
this was removed in 1.16.3 as it is now a block tag.
2020-11-15 15:21:38 +01:00
a00f619017 porty porty all the PRs 2020-11-15 10:41:05 +01:00
simibubi
d383965618
Merge pull request #503 from Snownee/mc1.15/snownee
Bug fixes
2020-11-14 22:10:16 +01:00
lizelive
730078f76a
fix build error (#509)
* fix #508 build error
2020-11-14 21:19:48 +01:00
fb46a8b59a Nozzles on Chutes 2020-11-14 16:48:32 +01:00
9ea09aef4c merge recent progress to 1.16 2020-11-14 15:22:32 +01:00
f01d80fd04 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-11-14 12:18:01 +01:00
2a9542e2bb Loading 1.14 worlds? Yes please.
Added highly experimental remap event support
2020-11-14 12:15:38 +01:00
simibubi
9a7596286d JEI Integration: Spout and Drain 2020-11-13 20:56:39 +01:00
simibubi
103c1a7441 Lifeless Flames
- Empty blaziers can now be lit using flint and steel
- Blaze burners now have ambient sounds and sounds played when fed items
2020-11-12 12:58:26 +01:00
Snownee
c730517fb4 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/snownee
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2020-11-12 08:03:24 +08:00
simibubi
675af419ce Fixing user errors
- Added hints when looking at
-    Mechanical arms with no targets
-    Funnels attempted to be used like 0.2 transposers
-    Bearings that require an update to attach to their blocks
- Added some additional feedback when players apply filters
- Spouts now place two blocks above a depot/belt when used
- Basins can no longer be placed directly under a press or mixer
- Fixed prismarine recipe cycles from various mod interactions
2020-11-11 23:59:40 +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
Snownee
6cc6973bc8 Fix BeltInventory.eject different behavior in orientations 2020-11-11 11:54:04 +08:00
Snownee
466739bcf5 Fix Extendo Grip knockback 2020-11-11 10:52:57 +08:00
Snownee
85b3ab2025 Fix SchematicWorld NPE 2020-11-11 01:48:42 +08:00
Snownee
5bd6110d59 Implement GuiBlockModelRenderBuilder tinting 2020-11-11 01:17:06 +08:00
Snownee
1afab1dd51 Fix slab loot tables 2020-11-11 00:57:29 +08:00
Snownee
196083cb00 Packet workaround 2020-11-10 00:51:56 +08:00
Snownee
6b34eb453d Defensive coding to prevent client chunk loading 2020-11-08 22:54:46 +08:00
Snownee
2e3100be9a Fix JEI ingredients getting merged incorrectly 2020-11-08 20:53:12 +08:00
Snownee
671f307071 Fix blockzapper duplicating bonemeal and breaking bedrock 2020-11-08 18:12:44 +08:00
Snownee
5958370900 Give ProcessingOutput a default count 2020-11-08 17:30:40 +08:00
Snownee
428dda58e7 Fix deployer duplicating Quark pickarang 2020-11-08 16:30:55 +08:00
Snownee
073e3980ee Fix water rendering overlay on glass blocks 2020-11-08 16:29:58 +08:00
simibubi
fb06dc5e72 Port new changes to 1.16 2020-11-06 20:56:19 +01:00
simibubi
0a98171384 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-11-06 20:49:00 +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
910bdf5d19 Port changes to 1.16 2020-10-30 19:47:40 +01:00
simibubi
d26139576c Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-30 19:36:03 +01:00
simibubi
e701569fee Automatic Acrobatics
- Added the item drain
- Refactored pulley renderers
- Fixed belt funnel not dropping filters
- Fixed funnel filter slot positioning on upward facing funnels
- Sails can now be sheared
- Fixed the kinetic connectivity of the rotation speed controller
- Valve handles can now by dyed in world
- Seats can now be dyed in world
- Fixed Stockpile Switch emitting redstone power towards its detection target
- Organized Imports
- Fixed server launch issues
2020-10-30 19:28:33 +01:00
simibubi
a9c90cd2b6 Clean-up Crew
- Fixed datagen
- Fixed tank multi-place
- Organized imports
2020-10-30 12:18:21 +01:00
Bob Dole
16ab29be1d Converted to 1.16 appropriate ways - builds 2020-10-30 03:11:07 -04:00
Bob Dole
c739fdbb09 Resolved merge conflicts - Does not Build 2020-10-30 03:06:15 -04:00
simibubi
1942d1dd63 Silence!
- Removed leftovers from debugging
2020-10-30 02:17:58 +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
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
7f643b9fe3 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/resources/META-INF/accesstransformer.cfg
2020-10-21 01:17:54 +02:00
420501af89 Fix Server crash on chromatic compound conversion 2020-10-21 01:03:27 +02:00
simibubi
c47e83f87b Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-20 21:25:17 +02:00
simibubi
0b3f0fd198 More Tweaks 2020-10-20 21:21:33 +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
275d8cf7b6 Fixed datapack reload listeners 2020-10-20 19:37:30 +02:00
simibubi
a8031b7569 Missed Tags 2020-10-20 17:34:39 +02:00
simibubi
fdd1e22c3e RAM-powered Minecarts
- Fixed critical memory leak from minecart controller listeners
- Made JEI heat conditions a little more readable
2020-10-20 14:56:07 +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
7ca8325b5f
Merge pull request #484 from gamrguy/extra-attributes
Extra attribute filters
2020-10-20 12:58:35 +02:00
simibubi
47f5225129
Merge pull request #490 from wchen1990/mc1.15/dev
Fix Bell contraptions and Schematic usage
2020-10-20 12:53:30 +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
simibubi
ac8879a008
Merge pull request #448 from YukkuriC/fix-link-update
Fix link update #447
2020-10-20 12:43:39 +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
Bob Dole
9729c137f1 Fix Bell contraptions and Schematic usage
- Bell contraptions no longer causes a NullPointerException when they
  are stopped
- Schematic usage shouldn't require a player to not be sneaking, and
  changes the key to CTRL to match tool tips
2020-10-19 18:40:59 -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
bbe7ef820d Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-17 17:33:54 +02:00
Zelophed
7ef31b9053 Spooky Filters
- allow our filters to be populated from JEIs ghost-ingredients
2020-10-17 17:32:37 +02:00
Colman Davenport
083a9c1140 Refactor FluidContentsAttribute 2020-10-17 11:24:15 -04:00
Colman Davenport
42ef3796a2 Refactor EnchantAttribute 2020-10-17 11:23:38 -04:00
Colman Davenport
6d51a6c730 Astral Sorcery Attributes 2020-10-17 01:25:29 -04:00
Colman Davenport
562abdea31 Written Book Attributes 2020-10-17 01:16:32 -04:00
Colman Davenport
c1bb1e64c9 Custom Name Attributes 2020-10-17 00:58:49 -04:00
Colman Davenport
6ff57ca65c Fluid Container Attributes 2020-10-17 00:26:16 -04:00
Colman Davenport
a7e2d842af Specific Enchantment Attribute 2020-10-17 00:04:23 -04: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
Zelophed
f499122ae5 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
2020-10-17 04:21:50 +02:00
Zelophed
d585fc0e21 ForgeCraft Playtesting, Part III-a
- fix chromatic compound needing line of sight to the sky to convert even when the beacon is active
2020-10-17 04:15:51 +02:00
Zelophed
b5930df58a merge changes from 1.15 2020-10-16 19:19:55 +02:00
Zelophed
b5802bb0e8 Merge branch 'mc1.15/dev' into mc1.16/dev
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java
2020-10-16 19:11:29 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +02:00
Zelophed
022bcdd620 Split mixing and mechanical crafting categories
- also fix a null-crash in ArmTileEntity
2020-10-16 18:57:21 +02:00
c44d80ac82 TiC casting table(basin compat 2020-10-16 15:32:58 +02:00
a440ab6772 Make tree fertilizer work on slime saplings 2020-10-16 12:18:14 +02:00
893294b9e4 make the saw work 2020-10-16 11:37:28 +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
dcd0598e16 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-10-14 20:52:40 +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
31baac3c8c Not Enough Bugs
- fixed last blaze burner of a stack disappearing when clicking a blaze entity
- remove dead code from the valve handle class
2020-10-14 16:13:09 +02:00
simibubi
f2acea7f77 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-13 20:57:30 +02:00
simibubi
d973e9bcdd JEI fixes
- Fluids in JEI now display the exact amount required
- Fixed short background of custom compacting JEI
- Fixed localization of sawing recipe category
- Fixed blocks waterlogged by a pump not scheduling a fluid update
2020-10-13 20:39:44 +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
Colman Davenport
677363f1b8 Update rendering 2020-10-13 00:10:23 -04:00
Colman Davenport
b89710237d Saws check actual verticality in contraptions 2020-10-12 23:25:35 -04:00
Colman Davenport
5342beacaf Conditional moving saw operation
- Saws are inactive while moving backwards
- Vertical moving saws can now damage entities
2020-10-12 23:25:35 -04: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
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
5966040d12 Merge branch 'mc1.15/dev' into mc1.16/dev 2020-10-12 21:59:30 +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
56f5ca45e3
Merge pull request #456 from gamrguy/kelp-harvester
Allow harvesters to harvest kelp tops
2020-10-12 16:09:40 +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
0f2ecfd45e merge nixie tubes to 1.16 2020-10-11 19:14:37 +02:00
simibubi
1b84bbf16f Custom Nixies
- Rows of nixie tubes will now display text from a name tag used on them
- Nixie tubes will dynamically update score/selector/nbt components in the displayed text
2020-10-11 17:50:48 +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
474d21de9a clean up some unused imports 2020-10-10 18:23:56 +02:00
850297f777 Switch valve handles back to crank shapes as those fit better to the new model 2020-10-10 18:16:28 +02:00
cb135df649 Configurable hunger games 2020-10-10 18:13:40 +02:00
9bff016ba4 Depot comparing 2020-10-10 17:54:17 +02:00
299663295c fixes now for 1.16.3 2020-10-10 10:26:54 +02:00
f593aca95d fix build issues 2020-10-09 20:36:40 +02:00
23beff40f3 Chute and Air: hopefully fix non-dev env issues 2020-10-09 20:28:20 +02:00
0da410b105 port recent changes to 1.16.3 2020-10-09 19:42:32 +02:00
71ebdf044b Chute and Air. This took way too long. 2020-10-09 19:00:00 +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
482e02e5d3 Fix zapper not working (StringTextComponent.EMPTY != null) 2020-10-07 12:21:48 +02:00
6649ae8d28 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2020-10-07 12:14:04 +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
fb626eac1b Gauge goggle overlay is now displayed correctly 2020-10-06 17:54:17 +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
37a61ef0e4 Fix GeneratingKineticTileEntity rendering the gui overlay crashing the game 2020-10-04 00:05:33 +02:00
tterrag
a15937b5fc Fix datagen issues, ingame achieved! 2020-10-03 17:36:32 -04: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
tterrag
74fadd94d6 More porting, fix updateNeighbors and particle codecs 2020-10-03 16:14:14 -04: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
f364e341a4 hunger games 2020-10-02 11:40:12 +02:00
d5f2d9b101 fruit loops 2020-10-01 18:49:40 +02:00
5cf4e02f45 Simi Says
- reverted to temporary ItemStackHandlers to modify basins to avoid having weird TEs that should only exist on Clients present on the server
2020-10-01 15:18:27 +02:00
59f19adb89 optimized bucket dumping 2020-10-01 14:08:56 +02:00
c1316d1c8d Dump the moving bucket 2020-10-01 12:37:55 +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
simibubi
27b05bc43e Portable Storage Interface remaster
- Implemented new PSI models by Kryppers
- PSIs are now used in pairs like contacts
- PSIs now act as an inventory proxy of the attached contraption
- Comparators can detect when two PSIs are interfacing
- Contraptions will continue moving after a second of inactivity
2020-09-24 20:32:16 +02:00
92a6e32b19 Fixed some more stuff 2020-09-24 16:17:16 +02:00
simibubi
2d6d360da4 Workstation transfer, Part II
- Intermediate changes, probably doesn't even compile
2020-09-24 13:39:40 +02:00
simibubi
d9d5e60606 Workstation transfer, Part I
- Intermediate changes, probably doesn't even compile
2020-09-24 13:39:12 +02:00
88d52814c5 Fixed tagging and some misc 2020-09-23 23:14:00 +02:00
ae7a24d2a3 Below 3 digit compile errors, finally 2020-09-23 21:42:31 +02:00
5538441e9f Still 3 digit compile errors? Fixed a bunch, probably broke a bit too 2020-09-23 11:15:32 +02:00
2f2a5674f3 Ok, still above 100 compile errors, but progress... 2020-09-22 23:18:13 +02:00
a142cfdb85 Last porty for the day 2020-09-22 22:28:51 +02:00
f01aeee43e even more porty? 2020-09-22 22:00:44 +02:00
fe92f8fb41 Even more porty 2020-09-22 21:17:11 +02:00
83c64121eb Do some porty stuff 2020-09-22 17:44:22 +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
tterrag
4beaab9b97 Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.16/dev
Update to 1.16.3

Conflicts:
	src/main/java/com/simibubi/create/AllBlockPartials.java
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/AllTags.java
	src/main/java/com/simibubi/create/ClientEvents.java
	src/main/java/com/simibubi/create/CommonEvents.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/StorageInterfaceMovement.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java
	src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPipeModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankBlock.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankCTBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankModel.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java
	src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterBlock.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterRenderer.java
	src/main/java/com/simibubi/create/content/contraptions/processing/HeaterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltHelper.java
	src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
	src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java
	src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperPolishingRecipe.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorMovementBehaviour.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorSlots.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/ExtractorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/extractor/LinkedExtractorBlock.java
	src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java
	src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/belt/TransportedItemStackHandlerBehaviour.java
	src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/SynchronizedExtraction.java
	src/main/java/com/simibubi/create/foundation/utility/AngleHelper.java
	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
	src/main/java/com/simibubi/create/foundation/utility/VecHelper.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/BlockClusterOutline.java
	src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java
2020-09-20 00:37:27 -04: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
2061072f8c Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-09-13 22:00:15 +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
LordGrimmauld
a015901571
Merge pull request #459 from gamrguy/render-fix
Fix unsided filters that shouldn't render
2020-09-13 11:37:56 +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
Colman Davenport
adfeeba5a1 Fix unsided unplaced filters still rendering 2020-09-12 15:50:12 -04:00
6604096131 Merge branch 'mc1.15/dev' of https://github.com/Creators-of-Create/Create into mc1.15/dev 2020-09-12 16:37:34 +02:00
d1c6352629 Creative Crate on contraptions 2020-09-12 16:27:48 +02:00
f58245158d Chest Minecart contraptions 2020-09-12 14:59:31 +02:00
2e938c11bd Fix dispense location to be actually where the opening of the dispenser is 2020-09-12 10:23:25 +02:00
simibubi
fe2c27db35 Spout refinements
- Fixed upright items rendering inconsistently between belt and depot
- Fixed various timing and sync issues with the spout
- Added a recipe type for spout filling
- Fixed more co-modification on belts
- Item and fluid nbt tags in recipes are now data-generated as json objects rather than strings
- Transported item processing can now leave items behind
- Transported item processing now has more meaningful result data
- Tweaked spout animation
- Fixed cullfaces on spout model
2020-09-11 14:31:26 +02:00
c572b48bbe MovedProjectileDispenserBehaviour#of now takes vanilla inaccuracy and velocity into account 2020-09-11 10:58:17 +02:00
54f91c82aa Fixed entity lookup for projectile dispense behaviours not working outside the dev environment 2020-09-11 09:53:32 +02:00
simibubi
bfd4b9dbda Fixed processing recipe packet data 2020-09-11 00:00:16 +02:00
simibubi
f564ce1a33 The Buffer Kerfuffle
- Refactored animated bytebuffers
- Fixed animated buffers bleeding vertices and rendering inconsitently when switching from/to optifine shaders
2020-09-10 23:37:14 +02:00
4325cef8dc split buffering to prevent crashes when the registered ProjectileDispenseBehavior has some weird stuff going on (mod compat) 2020-09-10 16:33:29 +02:00
34f9516d54 Added indirect projectile dispense behaviours for compatibility with modded projectiles right out of the box. Removed the direct projectile behaviours from vanilla as they are now covered from the indirect implementation. 2020-09-10 16:28:55 +02:00
3d006e7e87 refactor getDispenseStack to getDispenseLocation, delete unused variable declaration in getUseableLocations, added accidentially removed comment back 2020-09-10 13:28:33 +02:00
7784e5b58d Added potion moved dispense behaviour, fixed dispense behaviour output stack not being used resulting in potential dupes 2020-09-10 13:23:05 +02:00
3b516f5022 Unstackable items are a thing, i guess 2020-09-10 11:41:23 +02:00
Colman Davenport
e682e232e6 Allow harvesters to harvest kelp tops 2020-09-09 13:03:54 -04:00
simibubi
59339a7bcb Re-attached MovementBehaviour to funnels 2020-09-08 18:42:11 +02:00
e493ab9ce1 Fix hopper minecart being unable to pick up item entities on top of the saw. Remove item handler capability from bottom of saw to achieve this. It is unlocigal logistical components could access the saw from the bottom anyways. 2020-09-06 13:14:52 +02:00
25bce3fc17 Fix schematicannon bedrock breaking with doors, tall flowers and beds 2020-09-06 12:43:41 +02:00
fb7b2e64b2 Fix extendo grip breaking item frames instead of making the item pop off 2020-09-06 12:07:33 +02:00
f85894b232 Fix deployer beehive crash #2 2020-09-06 11:52:41 +02:00
0a4aaaf81e Fix beehive deployer crash 2020-09-06 11:15:01 +02:00
d89807fad9 Fix wand of symmetry not applying fortune or silk touch 2020-09-06 09:35:49 +02:00
3c128946f3 Fix seapickle blockzapper dupe 2020-09-05 22:05:57 +02:00
637dee0919 Zapper and cannon now place crops in basic growth state 2020-09-05 22:02:07 +02:00
7fea4a66a0 fixed client to-desktop crash with ":" in schematic name 2020-09-05 21:30:36 +02:00
1f06acb497 Change item requirements for block zapper and schematicannon
grass path -> grass block
farmland -> dirt block
2020-09-05 21:24:00 +02:00
d73ebd0253 Changed polished stone crafting recipe to yield 4 stones to match polished vanilla stones and 1:1 stonecutter recipe 2020-09-05 20:48:34 +02:00
235cc445e8 Made AbstractEncasedShaftBlock#getPushReaction return PushReaction.NORMAL
This disables pushing of clutch, encased shaft and gearshift with vanilla piston, but is overall more consistent.
 To move TEs, use quark.
2020-09-05 18:41:40 +02:00
44bc5506cf Fix zinc ore sound inconsistency 2020-09-05 18:39:06 +02:00