Commit Graph

78 Commits

Author SHA1 Message Date
simibubi
bfd666bb9c Sequenced Adjustments
- Added more descriptive names for sequencer instructions
- 'Await' instruction now requires a rising flank to trigger
- Fixed invalid json of german localization
- Ingored crushing wheel controllers facing in blockstate datagen
2021-02-19 16:55:45 +01:00
8c8a9abd8a Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev
# Conflicts:
#	src/generated/resources/assets/create/blockstates/fluid_pipe.json
2021-02-18 22:32:45 +01:00
simibubi
d59fea1079 Bloat.
- Auto-Organize inputs
- runData after lang PRs
- change runWhenOn to non-deprecated unsafeRunWhenOn, now that late forge version is required
- Address a few warnings
2021-02-18 19:43:22 +01:00
c6f82bff5e Merge remote-tracking branch 'origin/mc1.15/dev' into mc1.15/dev 2021-02-16 20:29:40 +01:00
JozsefA
15302495f5 Merge remote-tracking branch 'upstream/mc1.15/dev' into mc1.15/experimental-rendering-merge
# Conflicts:
#	src/main/java/com/simibubi/create/AllEntityTypes.java
#	src/main/java/com/simibubi/create/AllSpriteShifts.java
#	src/main/java/com/simibubi/create/content/contraptions/base/KineticTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntityRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java
#	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java
#	src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltTileEntity.java
#	src/main/java/com/simibubi/create/foundation/command/AllCommands.java
#	src/main/java/com/simibubi/create/foundation/utility/outliner/Outliner.java
2021-02-15 21:27:08 -08:00
JozsefA
cfff806df4 some micro optimizations.
cache hot getters.
reduce number of calls to getBeltFacing() in BeltRenderer.
preserve floating point accuracy over (insanely) long play times.
rotate some normals and light some quads.
2021-02-08 21:17:25 -08:00
Snownee
c5447d5b9c Add NBTProcessors to enable detailed control to tile data.
Add safe check when contraption blocks adding back to world
2021-01-31 14:56:46 +08:00
JozsefA
ebd20f5173 suddenly, everything is smooth and dry
- replace all usages of Minecraft.getRenderPartialTicks() with AnimationTickHolder.getPartialTicks()
 - refactor stabilized and mounted lighters into one class
 - separate fancy contraption render logic and entity render logic, should maybe move *all* rendering to ContraptionRenderDispatcher
2021-01-23 23:07:12 -08:00
28cd9a1fe1 Druidcraft woodcutter compatibility 2021-01-20 22:36:04 +01:00
simibubi
1498cb1cfc Why are we still here, Part IV
- Mixers can no longer process single-item recipes
- Added processing recipes for items in AE2
- Fixed pams harvestcraft recipe catalysts not recycling properly
- Windmill bearings no longer assemble when the attached kinetics update
- Hose pulleys now display additional goggle info when their target fluid body is considered infinite
- Protected the natural scoria model from vertex-format changes made by optifine
- Andesite tunnels now split off single items to side outputs
- Fixed non-interpolated item animation on the Mechanical Saw
- Attempted fix to oriented contraption causing serialization issues
- Fixed mounted contraptions not updating yaw interpolation when stalled
- Fixed "shifting gears" advancement not triggering when using the cogwheel placement assist
- Schematicannons no longer cause pasted kinetic networks to be virtually interconnected
- Added sandstone -> sand; milling/crushing recipe
- Fixed Spouts duplicating container items in some configurations
- Fixed block cutting recipe outputs piling up beyond the gui boundaries
2021-01-03 22:29:55 +01:00
simibubi
cdf292295a Why are we still here, Part III
- Fan washing now supports up to 12 output stacks. For your textbook skyblock insanity. #620
- Chance outputs below 1% no longer show 0% in their tooltip
- Fixed creates components picking up dead items #618
- Fixed server-side crash when disassembling contraptions containing a creative crate
2020-12-31 16:02:59 +01:00
simibubi
ebf980b33c Itetraitor
- Fixed crash for schematics containing TE's that have no custom renderer attached
- Fixed broken filling recipes with virtual fluids of other mods
- Fixed Brass tunnels duplicating/deleting items
2020-12-21 16:05:32 +01:00
simibubi
d68d702b3a Fun with Recipes
- Added a couple of recipes involving fluids and things
2020-12-13 15:17:31 +01:00
simibubi
9a7596286d JEI Integration: Spout and Drain 2020-11-13 20:56:39 +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
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
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
eea9811053
Merge pull request #460 from gamrguy/improved-saws
Improved mechanical saw rendering and contraptions
2020-10-20 12:47:37 +02: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
Zelophed
7ef31b9053 Spooky Filters
- allow our filters to be populated from JEIs ghost-ingredients
2020-10-17 17:32:37 +02:00
Zelophed
a2e4cfb66d fixup! Split mixing and mechanical crafting categories 2020-10-16 18:58:35 +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
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
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
00a9b1c6c7 Not enough datagen
- Expanded the RecipeProvider infrastructure
- Migrated mechanical crafting recipes to generated
- Migrated cooking recipes to generated
- Fixed missing particles on vertical motor model
- Adjusted a few recipes
2020-09-04 12:20:19 +02:00
simibubi
213b504854 ProcessingRecipe Refactor
- Reworked and cleaned up Create's ProcessingRecipes
- Prepared ProcessingRecipes for fluid ingredients and outputs
- Added datagen infrastructure to ProcessingRecipes
- Migrated all hand-written ProcessingRecipes to generated
- Removed scrollinput on mixers
- Fixed recipe lookup cache not invalidating on datapack reload
- Removed "catalyst" ingredients
2020-09-04 01:23:09 +02:00
Zelophed
8e349380a5 fix tooltips getting occluded by certain gui elements
- addresses #412
- addresses #366
2020-08-21 20:46:09 +02:00
simibubi
80406e8782 Cleanup crew
- More refactors and enhancements to the blaze burner
2020-07-23 17:41:15 +02:00
Zelophed
b2a5a4822a more changes to heater and particles
-heater now uses a enum for the blaze state
-added new particles for the heater
-changed heaters voxel shape
2020-07-18 20:07:22 +02:00
9fe29193de Heated Mixing JEI support 2020-07-14 19:50:23 +02:00
02450bd2f7 More recipe Serializer changes
- added Interface IExtendedProcessingRecipe supporting requiredHeat, fluid inputs and fluid outputs
- set Mixing recipes to use the extended serializer in AllRecipeTypes
- removed constructor parameters specifying fluid usage in recipes that do not support fluids (and changed the ConversionRecipe JEI support class back)
- cleaned up annotations, ordered AllRecipeType enum values and imports, reformatted recipe code
2020-07-11 16:18:17 +02:00
a73919357b fluid reading for the processing recipes and its serializer 2020-07-10 22:46:11 +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
467af2ea20 Renamed AllItemsNew to AllItems 2020-05-28 01:30:14 +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
78ad674c22 Re-organized packages and utilities 2020-05-23 14:02:38 +02:00
simibubi
88337a3e0c Renamed AllBlocksNew to AllBlocks 2020-05-22 20:12:53 +02:00
simibubi
785c79786d Get registrated, Part II
- Set up datagen and registrate chains for all remaining blocks
2020-05-22 20:02:07 +02:00
simibubi
8ab9118de2 Get registrated
- Set up datagen and registrate chains for all remaining blocks from the contraptions section
2020-05-21 00:15:02 +02:00
simibubi
b773ba697f Generating water wheels and fans
- Kinetic TER now renders animated partials in the correct layer
- Ported Water wheel and Encased Fan to registrate
2020-05-19 16:41:54 +02:00
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
tterrag
7832e79b13 Update Registrate, remove now-unnecessary support code for block entries 2020-05-11 23:18:49 -04:00
simibubi
3eee3d2c87 Block entry wrappers
- Simi wants his helpers back
2020-05-11 22:34:02 +02:00
simibubi
20ab49e46e Better game element rendering in GUIs
- Fixed uv issues with connected textures
- Fixed chromatic scope not showing on blockzappers
- Refactored game element rendering in user interfaces, such as JEI screens
2020-05-11 17:48:00 +02:00
simibubi
e69af69b0a Ported new changes to 1.15 2020-05-11 00:48:58 +02:00
simibubi
901c530f62 Merge branch 'master' into mc1.15/dev 2020-05-11 00:23:28 +02:00
simibubi
4cbf424f4d The Bugs win
- Condensed mechanical crafting into one JEI page category, scaling down slots if necessary
- Fixed ploughs trying to break water blocks
- Fixed stationary contraptions getting nudged around by expiring farmland blocks
- Shulker boxes can now be used as portable storage on contraptions
- Added vertical rotation support to buttons, levers
- Fixed certain directional blocks flipping around inconsistently when contraptions rotate by 180 degress
- Random safety checks
- Vertical belts no longer pop when rotated horizontally
- Fixed inconsistent funnel activation when items are inserted on the same segment
- Fixed adjustable pulley popping off due to floating point precision issues
- Fixed toggle latch acting strangely with input signals
- Schematicannons can now place belts safely
- Removed invalid Schematic item from creative tab
2020-05-09 00:09:10 +02:00
Snownee
5fb65d68f7 Fix JEI tab background is not transparent 2020-05-07 22:22:25 +08:00