IThundxr
972a8c7662
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
2025-02-19 21:45:14 -05:00
IThundxr
4ebde6610c
Sodium enhanced animated textures
...
- Fix animated textures for saws and factory gauges not being animated when sodium is installed
2025-02-19 21:44:56 -05:00
TropheusJ
12c0abc864
rework block conductor API
2025-02-19 19:48:39 -05:00
IThundxr
7c538de32e
Double arrows
...
- Remove duplicate file
2025-02-19 18:41:16 -05:00
TropheusJ
066eb31813
my body is a machine that turns pasta into pull requests
...
- ContraptionMovementSetting API and cleanup pass
2025-02-19 13:13:24 -05:00
TropheusJ
8fceeb44a5
Go to API. Go directly to API. Do not pass GO, do not collect $200.
...
- BoilerHeater API
2025-02-19 13:01:45 -05:00
TropheusJ
44af2f9d5b
Go to API. Go directly to API. Do not pass GO, do not collect $200.
...
- BoilerHeater API
2025-02-19 13:00:25 -05:00
TropheusJ
0d013c8806
woe, API status be upon ye
...
- make portal track behavior API
- some cleanup while I'm at it
2025-02-19 12:40:55 -05:00
TropheusJ
381a0ae3bd
that's pretty important
...
- add register methods to AllDisplaySources/Targets
- move now-treadsafe registrations out of comment
2025-02-19 11:24:26 -05:00
TropheusJ
4bb2a862cf
fix legacy names, organize sources
2025-02-19 11:16:53 -05:00
TropheusJ
7ba5566c79
Merge branch 'mc1.20.1/feature-dev' into jay/mc1.20.1/attached-registry-refactors
2025-02-19 10:57:53 -05:00
TropheusJ
169e32d722
out, demons!
...
- convert registries to vanilla ones, make them API
- split display behaviors fully to sources and targets
- move display behaviors to registries
- add SimpleRegistry.Multi for one-to-many associations
- create SimpleBuilder for unified handling of these simple associated objects
2025-02-19 10:57:35 -05:00
IThundxr
026af35fa4
Cutting out issues
2025-02-18 07:15:08 -05:00
IThundxr
ab2eab05f8
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/fluids/PipeAttachmentModel.java
2025-02-17 16:38:42 -05:00
IThundxr
bbdb627a16
Ancient todo
2025-02-17 16:37:26 -05:00
IThundxr
4e7016f987
Breaking the cycle
...
- Fix a bunch of FIXME's and TODO's around the place
2025-02-17 14:49:45 -05:00
IThundxr
ba90f5405b
Merge branch 'refs/heads/mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelBlockEntity.java
# src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java
2025-02-17 14:48:15 -05:00
IThundxr
658225e318
Fortuneful Crushers
...
- Fix Crushing Wheels not applying fortune like they should
- Remove extra FIXME
2025-02-17 14:47:47 -05:00
IThundxr
a9b40126a4
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/AllRegistries.java
# src/main/java/com/simibubi/create/content/kinetics/belt/transport/TransportedItemStack.java
# src/main/java/com/simibubi/create/content/kinetics/fan/processing/FanProcessing.java
# src/main/java/com/simibubi/create/content/kinetics/fan/processing/FanProcessingType.java
# src/main/java/com/simibubi/create/content/kinetics/fan/processing/FanProcessingTypeRegistry.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPoint.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointType.java
# src/main/java/com/simibubi/create/content/kinetics/waterwheel/WaterWheelBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/AllItemAttributeTypes.java
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemAttribute.java
# src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedBehaviour.java
2025-02-17 11:05:01 -05:00
IThundxr
3bcabaf18e
Steamed Codecs
...
- Rewrite codecs using StreamCodec#composite(codec, getter, factory) to use StreamCodec#map instead
- Require StreamCodec's for ItemAttribute's
2025-02-17 10:56:19 -05:00
TropheusJ
0f752d604c
Merge remote-tracking branch 'refs/remotes/origin/mc1.20.1/feature-dev' into jay/mc1.20.1/attached-registry-refactors
...
# Conflicts:
# src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java
2025-02-17 08:34:54 -05:00
TropheusJ
27f8a3adcd
make MovingInteractionBehaviour api
2025-02-16 23:39:59 -05:00
TropheusJ
a5c4383eb5
make MovementBehaviour api
2025-02-16 23:36:03 -05:00
TropheusJ
d611992018
more null checking
2025-02-16 23:32:29 -05:00
TropheusJ
404ce0212c
add method to query by (Block/Fluid)State
2025-02-16 23:25:13 -05:00
TropheusJ
af365a8337
remove redundant block parameters
2025-02-15 21:51:16 -05:00
TropheusJ
e966455143
rework BlockSpoutingBehaviour and add new behaviors
2025-02-15 21:46:30 -05:00
TropheusJ
6edf7ec68e
invalidate everything
2025-02-15 19:54:44 -05:00
TropheusJ
3c9bfef30e
rename to SimpleRegistry
2025-02-15 19:44:59 -05:00
IThundxr
b28427fe2d
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev
2025-02-15 11:53:33 -05:00
IThundxr
150ef3e497
Non-Plural registries
2025-02-15 11:53:23 -05:00
simibubi
3d47f58daa
Autocompletely
...
- Restocker gauge UI now suggests the address of the frog port on top of its packager
2025-02-14 17:42:55 +01:00
simibubi
adb3de0461
Update Contraption.java
...
- Fixed vault rendering on contraptions
2025-02-14 17:11:52 +01:00
simibubi
01a9532678
Water whe doing
...
- Fixed factory gauge sending incomplete orders when activating in the same tick as a competing gauge
- Water wheels now maintain their texture material when pasted in a schematic
2025-02-14 16:46:17 +01:00
IThundxr
f66d29e34c
Merge branch 'refs/heads/mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/main/java/com/simibubi/create/content/logistics/item/filter/attribute/ItemAttribute.java
# src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
# src/main/java/com/simibubi/create/foundation/mixin/ContraptionDriverInteractMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/EntityMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/accessor/LevelRendererAccessor.java
# src/main/java/com/simibubi/create/foundation/mixin/client/CameraMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/client/EntityContraptionInteractionMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/client/HumanoidArmorLayerMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/client/LevelRendererMixin.java
# src/main/java/com/simibubi/create/foundation/mixin/client/ModelDataRefreshMixin.java
# src/main/java/com/simibubi/create/foundation/networking/BlockEntityConfigurationPacket.java
# src/main/resources/create.mixins.json
2025-02-14 08:26:51 -05:00
IThundxr
312f5a2929
Mixed Mixins II
2025-02-14 08:17:39 -05:00
IThundxr
b6d25705ac
Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev
2025-02-14 08:13:25 -05:00
IThundxr
e9eec088ce
Mixed Mixins
...
- Rewrite mixins, for the third and hopefully final time
2025-02-14 08:13:08 -05:00
simibubi
b1565391a4
Update CreateNBTProcessors.java
2025-02-14 11:44:37 +01:00
simibubi
208b88f93d
Merge branch 'mc1.20.1/dev' into mc1.20.1/feature-dev
2025-02-14 11:41:26 +01:00
Luiz Krüger
773fd257b9
fix: Resolve issue with book & quills on lectern contraptions ( #7276 )
...
Resolves #7253 . Where an attempt to parse JSON out of a writable book (not a written book), which has raw string data for the pages array caused a game crash.
2025-02-14 11:18:51 +01:00
Kevin Z
d95515a405
add writeBytes to displayLinkPeripheral to allow write utf8 from CC:T ( #7231 )
2025-02-14 11:17:38 +01:00
MoePus
4949df978a
use itemRenderer.render instead of renderStatic in ValueBoxRenderer ( #7125 )
2025-02-14 11:16:38 +01:00
Niklas Widmann
3c47276b67
use remaining items to calculate remainder items for basin recipes ( #7076 )
2025-02-14 11:13:48 +01:00
IThundxr
7294ba9e22
Fix display links not working with large stack size inventories ( #7055 )
...
- Fixes #6992
2025-02-14 11:12:09 +01:00
simibubi
7a0ebd96d1
Belt smelts
...
- Fixed items processed by spout/press/deployer not able to be processed by fan afterwards #7012 #6559 #7013
- Fixed belt items resetting fan processing progress on reload
2025-02-14 11:10:45 +01:00
IThundxr
ae185b875a
Fix endermen teleporting to Shafts and Fluid Pipes ( #6967 )
2025-02-14 10:09:26 +01:00
justliliandev
3f464bcefa
stop adventure mode from changing block configs ( #7043 )
2025-02-14 10:02:53 +01:00
IThundxr
0bcc9a50a7
Merge branch 'mc1.20.1/feature-dev' into mc1.21.1/dev
...
# Conflicts:
# src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
# src/generated/resources/.cache/dc4224e5ed0ee367217e022442da0b7476174a87
# src/generated/resources/data/create/recipe/crafting/logistics/packager.json
# src/main/java/com/simibubi/create/content/contraptions/AbstractContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/Contraption.java
# src/main/java/com/simibubi/create/content/contraptions/ContraptionHandlerClient.java
# src/main/java/com/simibubi/create/content/contraptions/ControlledContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/OrientedContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/actors/trainControls/ControlsHandler.java
# src/main/java/com/simibubi/create/content/contraptions/gantry/GantryCarriageBlock.java
# src/main/java/com/simibubi/create/content/contraptions/gantry/GantryContraptionEntity.java
# src/main/java/com/simibubi/create/content/contraptions/minecart/capability/MinecartController.java
# src/main/java/com/simibubi/create/content/contraptions/mounted/MinecartContraptionItem.java
# src/main/java/com/simibubi/create/content/contraptions/piston/PistonExtensionPoleBlock.java
# src/main/java/com/simibubi/create/content/contraptions/pulley/PulleyBlock.java
# src/main/java/com/simibubi/create/content/contraptions/render/ContraptionVisual.java
# src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionInteractionPacket.java
# src/main/java/com/simibubi/create/content/contraptions/sync/ContraptionSeatMappingPacket.java
# src/main/java/com/simibubi/create/content/decoration/copycat/CopycatBarsModel.java
# src/main/java/com/simibubi/create/content/equipment/bell/BasicParticleData.java
# src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintAssignCompleteRecipePacket.java
# src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintEntity.java
# src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintItem.java
# src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintMenu.java
# src/main/java/com/simibubi/create/content/equipment/blueprint/BlueprintOverlayRenderer.java
# src/main/java/com/simibubi/create/content/equipment/extendoGrip/ExtendoGripItem.java
# src/main/java/com/simibubi/create/content/equipment/potatoCannon/BuiltinPotatoProjectileTypes.java
# src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoProjectileEntity.java
# src/main/java/com/simibubi/create/content/equipment/sandPaper/SandPaperItem.java
# src/main/java/com/simibubi/create/content/equipment/symmetryWand/SymmetryWandItem.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxBlockEntity.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxDisposeAllPacket.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxEquipPacket.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxHandler.java
# src/main/java/com/simibubi/create/content/equipment/toolbox/ToolboxMenu.java
# src/main/java/com/simibubi/create/content/equipment/wrench/WrenchEventHandler.java
# src/main/java/com/simibubi/create/content/equipment/wrench/WrenchItem.java
# src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainBlock.java
# src/main/java/com/simibubi/create/content/fluids/particle/FluidParticleData.java
# src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java
# src/main/java/com/simibubi/create/content/fluids/tank/FluidTankBlock.java
# src/main/java/com/simibubi/create/content/fluids/transfer/FluidDrainingBehaviour.java
# src/main/java/com/simibubi/create/content/kinetics/base/RotationIndicatorParticleData.java
# src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java
# src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltCrusherInteractionHandler.java
# src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltFunnelInteractionHandler.java
# src/main/java/com/simibubi/create/content/kinetics/belt/transport/BeltTunnelInteractionHandler.java
# src/main/java/com/simibubi/create/content/kinetics/crafter/ConnectedInputHandler.java
# src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/crusher/CrushingWheelControllerBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java
# src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
# src/main/java/com/simibubi/create/content/kinetics/fan/AirFlowParticleData.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/AllArmInteractionPointTypes.java
# src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmPlacementPacket.java
# src/main/java/com/simibubi/create/content/kinetics/millstone/MillstoneBlock.java
# src/main/java/com/simibubi/create/content/kinetics/saw/SawBlockEntity.java
# src/main/java/com/simibubi/create/content/kinetics/simpleRelays/encased/EncasedCogwheelBlock.java
# src/main/java/com/simibubi/create/content/kinetics/steamEngine/SteamJetParticleData.java
# src/main/java/com/simibubi/create/content/kinetics/transmission/sequencer/SequencedGearshiftBlock.java
# src/main/java/com/simibubi/create/content/legacy/ChromaticCompoundItem.java
# src/main/java/com/simibubi/create/content/logistics/box/PackageEntity.java
# src/main/java/com/simibubi/create/content/logistics/box/PackageItem.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
# src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnection.java
# src/main/java/com/simibubi/create/content/logistics/funnel/AbstractFunnelBlock.java
# src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlock.java
# src/main/java/com/simibubi/create/content/logistics/packager/PackagerBlockEntity.java
# src/main/java/com/simibubi/create/content/logistics/tableCloth/ShoppingListItem.java
# src/main/java/com/simibubi/create/content/logistics/tunnel/BrassTunnelBlock.java
# src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlock.java
# src/main/java/com/simibubi/create/content/processing/basin/BasinBlock.java
# src/main/java/com/simibubi/create/content/processing/basin/BasinRecipe.java
# src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerBlock.java
# src/main/java/com/simibubi/create/content/processing/burner/BlazeBurnerHandler.java
# src/main/java/com/simibubi/create/content/processing/sequenced/SequencedAssemblyRecipe.java
# src/main/java/com/simibubi/create/content/processing/sequenced/SequencedRecipe.java
# src/main/java/com/simibubi/create/content/redstone/displayLink/DisplayLinkBlockEntity.java
# src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
# src/main/java/com/simibubi/create/content/trains/CubeParticleData.java
# src/main/java/com/simibubi/create/content/trains/display/FlapDisplayBlock.java
# src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItem.java
# src/main/java/com/simibubi/create/content/trains/schedule/ScheduleItemEntityInteraction.java
# src/main/java/com/simibubi/create/content/trains/station/GlobalStation.java
# src/main/java/com/simibubi/create/content/trains/track/TrackBlockItem.java
# src/main/java/com/simibubi/create/content/trains/track/TrackModel.java
# src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java
# src/main/java/com/simibubi/create/foundation/block/render/ReducedDestroyEffects.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/particle/AirParticleData.java
# src/main/java/com/simibubi/create/foundation/particle/ICustomParticleData.java
# src/main/java/com/simibubi/create/foundation/particle/ICustomParticleDataWithSprite.java
# src/main/java/com/simibubi/create/infrastructure/command/HighlightCommand.java
2025-02-13 14:55:00 -05:00
IThundxr
c67b0536bc
Formatted perfectly
...
- Format code with some basic inspections
2025-02-12 20:06:12 -05:00
