Commit graph

4784 commits

Author SHA1 Message Date
IThundxr
31400c7e55
Empty carts 2025-01-30 19:13:23 -05:00
simibubi
011231b6ec Get a load of this
- Fixed track graphs not migrating from 1.20 worlds
- Fixed anything using blockfaces not migrating from 1.20 worlds
- Fixed assembled empty depots kicking the player
- Fixed passenger offsets of package entities
- Fixed blueprint entity bb causing a stack overflow
2025-01-30 19:11:41 +01:00
IThundxr
a051817ca5
Sneaky final 2025-01-30 09:17:26 -05:00
IThundxr
0b97d5e43e
Mutant ninja requests 2025-01-30 08:58:05 -05:00
IThundxr
2078a78f84
Requested data
- Make AutoRequestData immutable, convert into a record and copy to make changes around the code to account for this
2025-01-30 08:21:29 -05:00
simibubi
638eb2c6a5 Fix imports 2025-01-30 13:57:11 +01:00
simibubi
dd5693d51d Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-30 13:35:09 +01:00
simibubi
34379ee1ef Move away from ServerLevel for cobble gen 2025-01-30 12:43:12 +01:00
IThundxr
8dd7e64c4c
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev 2025-01-29 16:43:09 -05:00
IThundxr
1941b8ac43
Sneaky listeners
- Fix visuals being registered to create's registrate and getting ignored
- Fix wildcards with things that use Glob#toRegexPattern
2025-01-29 16:43:02 -05:00
simibubi
605fd89584 It just works maybe
- Fixed stock keeper address box no longer saving for next request
- Fixed glitchy behaviour in address box highlighting
- Fixed frogport loading causing chunk holes on the client (its still leaving renderers dark, though)
- Removed direct log to plank conversion
- Schematicannon on 'replace blocks with empty' now send block updates at the edges after printing
2025-01-29 22:02:45 +01:00
simibubi
9d8db56e3d That can be arranged
- Requesting a single jei craft in the stock ticker allows it to auto-arrange into crafters
- Restocker gauges now show a message when no address is set
2025-01-29 13:22:40 +01:00
simibubi
f74eb1d211 Hide and seek
- Fixed stealth package rendering with inverted yaw
- Declutter JEI by only showing one potion fluid instance per effect
2025-01-29 10:36:23 +01:00
IThundxr
4f699fc221
Update changelog II 2025-01-28 17:34:02 -05:00
IThundxr
1f3782d336
Update changelog 2025-01-28 17:18:37 -05:00
IThundxr
c2e83349e1
Stacking effects
- Fix potion effects stacking in the tooltip
- Fix filling recipes
2025-01-28 16:17:03 -05:00
IThundxr
61e08b13a2
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-28 15:28:51 -05:00
IThundxr
242871bdaa
Spaced out 2025-01-28 15:21:22 -05:00
IThundxr
3799a43039
Emptier than ever 2025-01-28 15:16:00 -05:00
IThundxr
667a252f4e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	build.gradle
#	gradle.properties
#	src/generated/resources/.cache/3055aa55530438925fbff1670d3e8dc6cc209bf3
#	src/generated/resources/data/create/recipe/milling/cactus.json
#	src/generated/resources/data/create/tags/block/sugar_cane_variants.json
#	src/generated/resources/data/minecraft/tags/block/combination_step_sound_blocks.json
#	src/generated/resources/data/minecraft/tags/block/inside_step_sound_blocks.json
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/api/equipment/goggles/IHaveGoggleInformation.java
#	src/main/java/com/simibubi/create/compat/Mods.java
#	src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
#	src/main/java/com/simibubi/create/compat/jei/category/BasinCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/SpoutCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/sequencedAssembly/SequencedAssemblySubCategory.java
#	src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlock.java
#	src/main/java/com/simibubi/create/content/equipment/armor/BacktankBlockEntity.java
#	src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java
#	src/main/java/com/simibubi/create/content/equipment/tool/CardboardSwordItem.java
#	src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlock.java
#	src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlockEntity.java
#	src/main/java/com/simibubi/create/content/fluids/potion/PotionFluid.java
#	src/main/java/com/simibubi/create/content/fluids/potion/PotionFluidHandler.java
#	src/main/java/com/simibubi/create/content/fluids/spout/SpoutBlockEntity.java
#	src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlockEntity.java
#	src/main/java/com/simibubi/create/content/kinetics/base/KineticBlockEntity.java
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerBlockEntity.java
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
#	src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
#	src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamEngineBlockEntity.java
#	src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelStructuralBlock.java
#	src/main/java/com/simibubi/create/content/logistics/chute/ChuteBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
#	src/main/java/com/simibubi/create/content/logistics/funnel/FunnelBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/stockTicker/StockTickerBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlockEntity.java
#	src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
#	src/main/java/com/simibubi/create/content/processing/basin/BasinBlockEntity.java
#	src/main/java/com/simibubi/create/content/processing/burner/BlockBasedTrainConductorInteractionBehaviour.java
#	src/main/java/com/simibubi/create/content/redstone/link/controller/LecternControllerBlockEntity.java
#	src/main/java/com/simibubi/create/content/trains/track/AllPortalTracks.java
#	src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
#	src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java
#	src/main/java/com/simibubi/create/infrastructure/debugInfo/ServerDebugInfoPacket.java
#	src/main/resources/META-INF/mods.toml
2025-01-28 13:21:10 -05:00
IThundxr
a7518e0dfe
Merge remote-tracking branch 'upstream/mc1.20.1/dev' into mc1.20.1/feature-dev
# Conflicts:
#	build.gradle
#	src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c
#	src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
#	src/main/java/com/simibubi/create/AllBlocks.java
#	src/main/java/com/simibubi/create/compat/Mods.java
#	src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java
#	src/main/java/com/simibubi/create/compat/jei/category/ItemDrainCategory.java
#	src/main/java/com/simibubi/create/content/contraptions/actors/contraptionControls/ContraptionControlsBlockEntity.java
#	src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java
#	src/main/java/com/simibubi/create/content/logistics/filter/FilterItemStack.java
#	src/main/java/com/simibubi/create/foundation/item/ItemHelper.java
#	src/main/java/com/simibubi/create/foundation/mixin/SmithingMenuMixin.java
#	src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java
#	src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java
#	src/main/java/com/simibubi/create/infrastructure/debugInfo/ServerDebugInfoPacket.java
#	src/main/resources/META-INF/mods.toml
#	src/main/resources/create.mixins.json
2025-01-28 11:35:06 -05:00
IThundxr
84aed3b3f3
API-ification
- Move overlay interfaces into the api package
2025-01-27 21:12:42 -05:00
IThundxr
02c75faada
Arts and crafts III 2025-01-27 15:56:10 -05:00
IThundxr
265dc75125
The instances and the visuals
- Complete the move to partials
- Fix compile errors from updating flywheel
2025-01-27 13:29:56 -05:00
IThundxr
d5d171a512
Legacy properties 2025-01-27 12:31:06 -05:00
IThundxr
e6a9f98a91
Leaky buckets
- Fix buckets placing flowing fluids instead of fluid sources
2025-01-27 12:22:17 -05:00
Cody
2cf08a1231
Fix deploying food missing particles and not returning the correct items (#7288)
* fix particle when deploying last food in stack

* Bowl foods deployer fix
2025-01-27 10:25:06 -05:00
Jozufozu
5cc77c6d2a Making room
- Move to createmod maven Flywheel
2025-01-26 17:48:43 -08:00
justliliandev
e2b65fd53c
Add api to add custom conductors to trains (#7030) 2025-01-26 18:46:33 -05:00
MoePus
4ba5e984a9
Fix rare spout crash and offset rendering (#7025) 2025-01-26 18:44:40 -05:00
James Mitchell
28d30f3c62
Update JEI integration and add potion fluids to the ingredient list (#6934)
* Update JEI integration and add potion fluids to the ingredient list

This also resolves a minor issue where all virtual fluids were considered "flowing".
Fixes https://github.com/mezz/JustEnoughItems/issues/3754

* Fixed JEI potion fluids registered without Bottle tag

---------

Co-authored-by: goshante <admin@drulia.ru>
2025-01-26 18:36:17 -05:00
IThundxr
266e950d8e
Feet off the table.
- Fix table cloth sounds
2025-01-26 16:36:49 -05:00
IThundxr
c0c1c1b622
Noisy weapons
- Fix cardboard sword not playing sounds when a player is hit by a mob wielding a cardboard sword
2025-01-26 16:28:13 -05:00
IThundxr
1f265eb923
There once was a ponder II 2025-01-26 15:39:48 -05:00
IThundxr
6fd17c9b49
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-26 15:39:15 -05:00
IThundxr
f3b5d96e48
There once was a ponder II 2025-01-26 15:25:02 -05:00
IThundxr
5ef80a9bd2
There once was a ponder 2025-01-26 15:16:40 -05:00
IThundxr
12df6e0084
Componentsn't
- Adjust to the removal of the Components class
2025-01-26 13:55:40 -05:00
IThundxr
45fae1c58a
Supplier-less II 2025-01-26 12:21:58 -05:00
IThundxr
e2a896bf7e
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
# Conflicts:
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/AddedByAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/BookAuthorAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/BookCopyAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ColorAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/EnchantAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/FluidContentsAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InItemGroupAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/InTagAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ItemNameAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/ShulkerFillLevelAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAmuletAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryAttunementAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryCrystalAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/attributes/astralsorcery/AstralSorceryPerkGemAttribute.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/legacydeserializers/AllItemAttributeLegacyDeserializers.java
#	src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/legacydeserializers/StandardTraitsLegacyDeserializer.java
2025-01-26 12:11:02 -05:00
IThundxr
670d8f08d6
Supplier-less
- Remove suppliers in AllItemAttributeTypes
2025-01-26 12:07:14 -05:00
IThundxr
c046d59eb9
Change logging 2025-01-26 11:34:30 -05:00
IThundxr
6cfaadde11
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev 2025-01-26 10:18:04 -05:00
simibubi
bca9f0638d Changelog and new package filter sprite 2025-01-26 13:10:28 +01:00
Kryppers
fe47ebe504 Ancient mixels
fixed long standing fault on steam engine texture.

reverted iron sheet texture

adjusted pipe drain geometry to prevent z fighting
2025-01-26 11:47:33 +00:00
simibubi
b43e67fdaa Out of order
- Fixed stock keeper screen not able to request one type item twice in a row
2025-01-26 10:42:43 +01:00
simibubi
f83b8523a6
Merge pull request #3 from Creators-of-Create/jay/mc1.20.1/mounted-storage-refactor
Mounted Storage Refactor
2025-01-26 10:15:40 +01:00
IThundxr
3060fee82e
Remembering it all
- Fix components not getting copied to the item upon pickup of schematic cannons, toolboxes and backtanks
2025-01-25 22:55:24 -05:00
TropheusJ
7494e646c0 addStorage helpers, catch all deserialization
and added depot legacy support
2025-01-25 22:39:51 -05:00
IThundxr
9bd910f0b7
Tested twice II
- Fix mechanical crafter gametest
2025-01-25 22:16:49 -05:00