Commit graph

2515 commits

Author SHA1 Message Date
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
e1d8415b09 Add Java version to build logs 2021-12-03 04:29:12 +01: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
Jozufozu
2bde87af33 haunted gradle
- Update forge
 - Add Flywheel to the runs when using Create/Flywheel gradle workspace
 - Fix weird intellij issues with mixin's annotation processor
2021-12-02 14:02:00 -08: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