Commit Graph

2456 Commits

Author SHA1 Message Date
reidbhuntley
e41825d5bf Replace Quark Cactus Paste crushing recipe with Moss Paste 2021-12-22 13:18:23 -05:00
reidbhuntley
bc2ced472e
Merge pull request #2462 from noolaan/patch-1
Delete quark biotite compatibility recipe
2021-12-22 13:12:43 -05:00
Jozufozu
97490e51ca Finally safe vertex formats
- true to false for Pepper
 - IBufferedModel -> BufferedModel
 - VertexFormat -> BufferLayout
 - Use ImmutableList in BufferLayout
 - LayoutItem naming consistency
 - Try to reduce usage of raw BufferLayouts
 - Move vertex interfaces to api package
 - #createWriter and #createReader in VertexType
 - Some documentation
2021-12-22 02:45:46 -08:00
Jozufozu
b8034b4b2e util and core cleanup
- Consolidate/audit utility classes
 - Move more towards sane vertex types
2021-12-22 00:22:43 -08:00
Jozufozu
aa96a28f0b Make the BatchingEngine not jittery
- Stop having threads compete for a single BufferBuilder
 - ...by skirting around minecraft's BufferSource
 - Begin work on making vertex writing sane
2021-12-21 22:47:30 -08:00
reidbhuntley
9897666249 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2021-12-21 17:08:20 -05:00
Aeiou
eafce50904
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev 2021-12-21 16:48:44 -05:00
PepperCode1
7942b570f0 Brackets, models, and reload listeners
- Fix bracket contraption rotation; Fix #1856
- Make sure KineticTileEntityRenderer only renders once
- Make use of new ModelUtil method in BakedModelRenderHelper
- Clear up BracketedKineticBlockModel and PipeAttachmentModel logic
- Replace ISimpleReloadListener usage with ResourceManagerReloadListener
2021-12-21 13:44:00 -08:00
reidbhuntley
75d4295118 Merge remote-tracking branch 'origin/mc1.17/dev' into mc1.18/dev
# Conflicts:
#	src/main/java/com/simibubi/create/foundation/tileEntity/SmartTileEntity.java
2021-12-21 16:40:14 -05:00
reidbhuntley
10f84bcd79 Temporary fix for Forge 1.17 setRemoved() regression 2021-12-21 16:28:14 -05:00
reidbhuntley
a61739eb1e Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2021-12-21 12:23:12 -05:00
reidbhuntley
0a9c10a13d Fix Schematicannon rail placement crash 2021-12-21 12:22:49 -05:00
Jozufozu
5f46560fb2 StructType doesn't need #asBatched and #asInstanced
- More organized this way
 - BatchingTransformer function moved into Batched
2021-12-20 22:38:34 -08:00
Jozufozu
848eb904f5 Fluid#isSame is asymmetric
- Fixes #2490
2021-12-20 21:51:49 -08:00
reidbhuntley
b9310e93a9 Add mineable-with-pickaxe tag to new palette partial blocks 2021-12-20 19:50:17 -05:00
Aeiou
e6c99b250e Add more LevelHeightAccessor Overrides to WrappedWorld to avoid logical conflicts with other mods which may make changes to the default vanilla implementations of these methods. In particular, Create Refabricated would conflict with Lithium if Starlight was installed. These changes prevent such an issue from occurring if a Forge mod were to attempt a similar optimization to Lithium's, where Level heights are assumed to behave in predictable, static ways 2021-12-20 16:56:28 -05:00
Aeiou
7fd531199c Add Starlight to Mods enum, along with an executeIfInstalled method. Use said method in WrappedChunk in place of an if-statement to execute Starlight-dependent code 2021-12-20 16:56:27 -05:00
Aeiou
11e6c3f45a Change from jetbrains @NotNull to javax @Nonnull annotation in PlacementSimulationWorld 2021-12-20 16:56:27 -05:00
Aeiou
6938bc2e06 Implement Starlight compatibility. 2021-12-20 16:56:27 -05:00
Jozufozu
94a160699c Use task engine/sync to update instances 2021-12-17 02:17:39 -08:00
Jozufozu
3e01d3f441 Batching Engine
- Implement alternate backend using SBBs
2021-12-15 17:13:09 -08:00
Jozufozu
67bcbc874b Fix #extension crash on intel 2021-12-15 13:27:50 -08:00
nolan
107e5619fa
Delete quark biotite compatibility recipe
Quark removed Biotite in 1.18
https://twitter.com/VazkiiMods/status/1465859379866050561
2021-12-14 20:10:24 -08:00
simibubi
257767cbec Version up! 2021-12-13 08:20:16 +01:00
Jozufozu
dfdb8abf49 Use GL_ARB_conservative_depth when possible
- Allows the depth test to discard fragments before the fragment shader is run
2021-12-11 22:03:53 -08:00
Cael Warner
01866db72e
Fixed null pointer when resetting gameplay settings in config menu
- Added a null check to make sure a config value has a comment before trying to split the comment
- Fixes #2412
2021-12-11 20:58:23 -08:00
Cael Warner
51763382d3
Pulleys will now work in worlds with non-default world heights 2021-12-11 18:29:55 -08:00
Cael Warner
aa4668ef28
Fixed issues with new world height
- Pulleys are now able to extend below Y=0
- Super Glue can now be placed above Y=256, all the way up to the new world height limit of 320
- Fixes #2421, fixes #2426, fixes #2427
2021-12-11 17:44:03 -08:00
Jozufozu
1e9c94303e Bump flywheel build 2021-12-11 17:35:06 -08:00
Jozufozu
47f8d3f1b5 Cylindrical fog
- having the world position is very nice
 - mojang manages to do multiple matrix multiplications
2021-12-11 17:31:10 -08:00
PepperBell
080b048b2f SmarterTileEntity
- Clean up SyncedTileEntity and SmartTileEntity
- Allow schematicannons to be rotated based on placement angle
- Fix DirectionalExtenderScrollOptionSlot rotation
- Remove deprecated usage of JsonReader and LazyLoadedValue
- Move ToolSelectionScreen to content.schematics.client
- Organize imports
- Update to 1.18.1
2021-12-10 16:58:05 -08:00
Jozufozu
8101f19611 Worlds are bigger now
- Stop clamping Y in [0, 256)
2021-12-10 00:28:33 -08:00
simibubi
858fbd5c1a Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-10 01:45:35 +01:00
Jozufozu
2efbcdbd6b No more material spec, everything is StructType 2021-12-09 16:42:13 -08:00
simibubi
4350c3c334 Moving the Buds 2021-12-10 01:37:35 +01:00
simibubi
2f8cfc24bc Ah its not actually that good 2021-12-10 01:19:51 +01:00
Jozufozu
ef5afd42c3 Move api package 2021-12-09 15:32:55 -08:00
simibubi
3595863bad New Menu Background 2021-12-10 00:19:41 +01:00
simibubi
967323d0f8 Version bump 2021-12-09 18:47:22 +01:00
Jozufozu
1a3f27abc8 Reorganize, rename, refactor, 0.4.0
- Move most user facing interfaces to flywheel.api package
 - Refactor InstanceData to have no package private classes
 - Remove 'I' prefix from many interfaces
 - ILightUpdateListener -> LightListener
 - IMultiProgram -> ContextAwareProgram
 - IFlatLight -> FlatLit
 - All materials use the same vertex format: UNLIT_MODEL
2021-12-09 00:44:43 -08:00
simibubi
1590acd1ab Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-09 06:13:15 +01:00
simibubi
12768ee8b3 Send me a null 2021-12-09 06:10:53 +01:00
simibubi
46fc25f8e9 More suitable ids for brass diode TEs 2021-12-09 06:10:23 +01:00
simibubi
59f9ae1f30 Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-09 02:41:56 +01:00
simibubi
4708dcfca9 The less handsome Basin
- Fluid networks can now pull lava and water from filled cauldrons
2021-12-09 02:40:07 +01:00
Kryppers
8cf03e3845 Merge branch 'mc1.17/dev' of https://github.com/Creators-of-Create/Create into mc1.17/dev 2021-12-09 01:14:01 +00:00
Kryppers
facf09eaec Cut and Polish
Updated cut Ochrum textures
Updated calcite textures
Minor changes in other palette blocks.
2021-12-09 01:13:56 +00:00
simibubi
ed3df18a01 Port recent changes 2021-12-08 23:03:34 +01:00
simibubi
973576c030 Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-08 22:47:18 +01:00
simibubi
8eea60ddee Tuff on the Eyes
- Slightly reduced the amount of block types represented in one batch of ore layers
2021-12-08 22:44:00 +01:00
Jozufozu
35bfa8a15c #tick and #beginFrame on creation
- Fixes weird delay in object appearance when reloading chunks
2021-12-08 12:30:08 -08:00
Jozufozu
4041897d29 Groups store their types again
- Fix crash rendering breaking overlay
2021-12-08 12:28:38 -08:00
simibubi
2e56ad6714 Pillar of Jank
- Added connectivity restrictions to pillar blocks
- Fixed reversed uvs on z-axis pillars
- Fluid Pipes now require twice the amount of Copper
2021-12-08 16:57:23 +01:00
Jozufozu
a3476fd54c Keeping up
- Contraptions always use ArrayModelRenderer
 - De-duplicate UI framebuffer swapping code
 - Unbind VAO between contraption structure drawing and engine drawing
 - Bump flywheel build
2021-12-07 23:15:09 -08:00
Jozufozu
5ad0d1d704 Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-07 21:19:25 -08:00
simibubi
b40901621a Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-08 02:21:27 +01:00
Kryppers
b6c66868ca Pillar of Awesome
numerous tweaks to the new pillar textures
2021-12-08 01:06:41 +00:00
Jozufozu
5ae4e49787 Get started on a batching engine
- An Engine is a MaterialManager and a RenderDispatcher
 - Refactor InstanceManager's ctor to use the MaterialManager interface instead of the concrete type
 - MaterialManagerImpl -> InstancingEngine
 - Add skeleton for BatchingEngine
 - Hack in InstanceWorld to switch between the 2
 - Rename/move existing MaterialManager impl to new package
2021-12-07 13:41:43 -08:00
simibubi
62b3a0491a Slight tweak to Layered ore frequency 2021-12-07 19:18:56 +01:00
simibubi
65dfc41b62 Merge branch 'mc1.17/dev' into mc1.18/dev 2021-12-07 19:03:01 +01:00
simibubi
3de903ac2a No Flywheel no Flaps
- Fixed Layered ore deposits not able to replace deepslate
- Fixed Funnels and Deployers not fully rendering on contraptions when flywheel is disabled
2021-12-07 19:01:30 +01:00
simibubi
061b85d515 New version who dis?
- Port to 1.18
- ChunkUtil discontinued
- SmartTileEntities write to metadata
- Features generate from -64 up
- World Wrappers weren't convoluted enough
- Haunted bell considers >0 safe
- Missing GuiUtils methods continued in RemovedGuiUtils
2021-12-07 18:24:57 +01:00
simibubi
9362374b1e Vault Virtual
- Double chests no longer split when moved on a contraption
- Changed the way contraption storage interacts with known multi-block item storage (band-aid solution)
- Changed a few blocks' sound types
- Fixed in-world icons not rendering
- Added Ponder Scenes for the Item Vault
- Added crafting recipe for Item Vaults
- Changed crafting recipe for Fluid Tanks
- Fixed ponder tracking items in inactive inventory screens
- Removed unreachable Advancements
2021-12-07 02:35:38 +01:00
Jozufozu
5e1479d147 Fix drill rendering on contraptions 2021-12-06 15:37:13 -08:00
Jozufozu
ffe670b391 Vanillaization
- IModels now accept a VertexConsumer
 - IRenderState -> RenderType
 - AbstractInstancer for dealing with InstanceData tidyness
 - Bump flywheel version
2021-12-06 15:36:47 -08:00
DaniCherryJam
edbf95c994 experience nugget, part 2
- new experience nugget texture, generated from an asset tennis session
2021-12-05 18:02:35 -06:00
PepperBell
0430f0ba0f Flattened pixels
- Compress all images
2021-12-05 13:23:13 -08:00
simibubi
3fcce376e5 Never Scene Before
- Fixed TileEntities in Ponder not receiving blockstate changes
- Fixed Ponder selection rendering offset
- Re-introduced the depth-sorting hack for PonderUI
- Editing mode is now a Config Option
- Fixed Non-Container Screens no longer closing on "E"
- Added tooltip for Experience Nuggets
- Fixed Schematic Prompt no longer starting auto-focused on the text field
- Pulse Extenders now actually extend the pulse, rather than emitting for a fixed time
- Updated Ponder Scenes for the repeaters
- Picking encased kinetic blocks no longer returns a creative-only item
- Added a Ponder Scene with encased cogwheels
- Implemented change of top & bottom texture for copper roof blocks
2021-12-05 19:44:35 +01:00
Kryppers
436f421dba Wax Off
Updated create decorative copper block textures (Shingle and Tiles) + oxide stages
Added Copper Roof top texture + oxide stages
Updated Copper Legacy Resource pack
2021-12-05 17:30:33 +00:00
simibubi
55b13bf421 Backwards Coppertability
- Added the option to ship opt-in resource packs
2021-12-05 14:05:57 +01:00
DaniCherryJam
38b656b501 experience nugget! now in HD
- replaced the temp experience nugget texture with a new, fancy, and potentially tasty texture
2021-12-05 05:02:27 -06:00
simibubi
afed0ae586 Belt lighting safety check 2021-12-05 02:54:43 +01:00
simibubi
410dcd61ae Backwards Palettability 2021-12-05 02:37:21 +01:00
simibubi
b487e0a46a Drowning in Datagen
- Mechanical Belts no longer have a Stress Impact
- Stairs and Slabs variants of blocks no longer use plural in their name
- "Polished" stone type variant now uses the prefix Polished Cut
- "Bricks" stone type variant now uses the prefix Cut
- Added more recipes for stone types and copper blocks for convenience
- Reverted re-texture of crushed copper ore
- Added waxed copper recipes for deploying
2021-12-05 00:18:08 +01:00
PepperBell
c6e630a60c The copper commit
- Match Create's copper block variants with vanilla's copper block
variants
- Add CopperBlockSet and CopperRegistries
- Remove copper plating block and OxidizableBlock
- Add remaps for copper ore and copper block and organize RemapHelper
- Fix belt funnel model names
- Bump required Forge version to 37.1.0
- Organize imports
2021-12-03 23:48:55 -08:00
simibubi
79e2ceb23c Packed and Voided
- Added crushing recipes for raw ore blocks
- Layered mineral deposits are slightly more likely to spawn
- Zinc ore is slightly less likely to spawn
- Added layered deposits with Scorchia
- Fixed tuff pillars texture size
- Modified recipe for the Wand of Symmetry
2021-12-04 06:23:01 +01:00
simibubi
210af91396 Cogwheel Configuration
- Reintroduced fluid-lava interactions
- Fixed incorrect uvs on horizontally connected blocks
- Encased cogwheels can now have shaft outputs
2021-12-04 04:17:42 +01:00
Jozufozu
117b5a93a3 No more InstanceData#write 2021-12-02 21:25:32 -08:00
Jozufozu
85b1b86883 Unsafe writers for StructTypes
- Bump flywheel build
2021-12-02 19:32:40 -08:00
simibubi
e2b8e1cb7d The Processing Experience
- Added the Experience Nugget
- Item Vaults are now Immune to regular explosion damage
- Encased Shafts and Cogwheels no longer appear on creative tabs
- Fixed gantry carriage model uvs
- Fixed Palette blocks & Item Vault not easily mineable using a pickaxe
- Fixed ponder crash when a non-ticking tile is shown
- Fixed cube particle interpolation and quads
- Fixed sawblades rendering with wrong rotations
- Items shown on JEI's Washing tab are now centred
- Introduced a new set of Ore Processing recipes
- Moved Portable Storage Interface to andesite tier
- Removed the Adjustable Crate
- Creative Crates can no longer span multiple blocks
- "Chromatic" items no longer appear on creative tabs
- Ejectors now emit comparator signals relative to their max accepted stack size
- Fixed combined slots in the toolbox menu not acting correctly
- Fixed background of the advancement tab
2021-12-03 03:57:00 +01:00
dithpri
dbb2f5729d
Fix #2372
- Powering smart chutes now disables output as well
2021-11-30 20:29:52 +01:00
simibubi
df8f5449f0 Layers of Insanity
- Fixed flipped uvs on horizontal capped faces
- Layered blocks once again can only face the vertical axis (for now)
- Texture updates by Kryppers
2021-11-30 03:18:45 +01:00
PepperBell
68bf1f399a Fix toolbox regression
- Fix toolbox menu closing regression
2021-11-28 18:50:27 -08:00
simibubi
b0ec966b98 Zinc Beans
- New Zinc Ore integration (Art by .vectorwing)
2021-11-28 04:07:18 +01:00
simibubi
cde2350418 Merge branch 'mc1.17/dev' of https://github.com/Creators-of-Create/Create into mc1.17/dev 2021-11-28 02:48:15 +01:00
simibubi
c1b4c8cef2 New Flavours
- Removed Gabbro, Dolomite, Weathered Limestone
- Added Crimsite, Asurine, Veridium, Ochrum
- Added and Removed palette blocks for Andesite, Diorite, Granite, Tuff, Deepslate, Dripstone, Calcite, Limestone, Scoria and Dark Scoria
- Custom stone types now generate as layers instead of ores
(Work in Progress)
2021-11-28 02:24:15 +01:00
PepperBell
1fdf1ff7e9 Destroyed and deprecated
- Fix rotation indicator particles
- Fix sail dyeing
- Turn BreakProgressHook into DestroyProgressRenderingHandler interface
- Refactor overlay rendering to properly use API
- Change SpriteShiftEntry to use StitchedSprites
- Use OnDatapackSyncEvent instead of mixin
- Organize foundation.ponder package
- Remove usage of deprecated:
-   Durability bar methods
-   Constants class
2021-11-27 14:49:43 -08:00
Jozufozu
7a4ed99fb5 Bump flywheel build
- New project slug
 - StitchedSprite changes
2021-11-27 12:46:01 -08:00
PepperBell
569975bc07 Merge remote-tracking branch 'upstream/mc1.16/dev' into mc1.17/dev
Conflicts:
	build.gradle
	gradle.properties
	src/generated/resources/.cache/cache
	src/generated/resources/assets/create/lang/unfinished/de_de.json
	src/generated/resources/assets/create/lang/unfinished/es_es.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/pt_br.json
	src/generated/resources/assets/create/lang/unfinished/zh_cn.json
	src/main/java/com/simibubi/create/AllBlocks.java
	src/main/java/com/simibubi/create/Create.java
	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableItemInterfaceTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java
	src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/PipeConnection.java
	src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java
	src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/RadialToolboxMenu.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxBlock.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxHandlerClient.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxInventory.java
	src/main/java/com/simibubi/create/content/curiosities/toolbox/ToolboxTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorTileEntity.java
	src/main/java/com/simibubi/create/content/logistics/block/depot/EntityLauncher.java
	src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
	src/main/resources/META-INF/mods.toml
2021-11-25 19:15:31 -08:00
Jozufozu
6eca281134 Hack for contraption cutout 2021-11-24 11:12:59 -08:00
simibubi
8a034d31a7
Merge pull request #2367 from Xandaros/patch-1
Fix de_DE controller rail translation
2021-11-24 14:10:05 +01:00
simibubi
393cc55e71 Stealthy Evaporation
- Fixed fluid networks losing fluids when extracted amount is lower than a pumps transfer speed
- Fixed JEI plugin claiming that some occultism's ritual recipes work in a compacter
- Fixed press/deployer/spout failing to process a belt item when another item is processed simultaneously further down the belt
2021-11-24 14:06:10 +01:00
Martin Zeller
b8127407fa
Fix de_DE controller rail translation 2021-11-24 06:17:21 +01:00
Jozufozu
507a1b1696 Merge remote-tracking branch 'origin/mc1.17/dev' into mc1.17/dev 2021-11-23 18:18:59 -08:00
Jozufozu
028ac4bbda Transform stack changes
- Add ToolBoxInstance
 - Move from MatrixTransformStack to TransformStack.cast where possible
 - SuperByteBuffer implements transform traits on its own
 - Bump flywheel build
2021-11-23 18:16:57 -08:00
simibubi
52eca118ad Back on Patch, Part III
- Better visibility for low/half amounts of fluids in basins
- Fixed Mechanical Press head getting stuck in extended position when off-screened or when its basin changes
- Added processingTime support to mixing recipes (defaults to 100)
- Fixed Basin recipes with fluid output not starting when targeted output inventory supports items only
- Fixed item extraction from create creating stacks of unstackable items when source inventory allows stacking them (Storage Drawers)
- Fixed Deployers not having a valid item capability when asked before their first tick
- Fixed Mechanical Crafting recipes able to be automated via packing
2021-11-23 18:55:39 +01:00
Alonso
ebf1a895c9
es_cl.json by Alonsinwhat (#2365) 2021-11-23 16:39:30 +01:00
PepperBell
3129672f3a Add CustomUseEffectsItem
- Add CustomUseEffectsItem interface implemented on items to control use
effects behavior
- Replace SandPaperEffectsHandler and SandPaperSoundMixin
- Fix broken polishing particles when no items in other hand (polishing
last item)
2021-11-22 20:12:45 -08:00
simibubi
97bff0f95f Other pipes are available
- Moved fluid update fix from encased pipes to all pipes
2021-11-22 12:44:36 +01:00
simibubi
27c69250d1 Portable Spillage Interface
- Fixed Chutes spilling items when inserting into disconnected storage interfaces
- Blaze Burners can now be picked up using the Wrench
- Additional safety checks from random crash reports
2021-11-22 11:38:52 +01:00